From 0bf48ef3be53ddaa52bbead65dfd75bf90e7a2b5 Mon Sep 17 00:00:00 2001
From: Ben Murdoch <benm@google.com>
Date: Tue, 11 Aug 2009 17:01:47 +0100
Subject: Merge in WebKit r47029.

---
 WebCore/platform/android/SearchPopupMenuAndroid.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'WebCore/platform/android/SearchPopupMenuAndroid.cpp')

diff --git a/WebCore/platform/android/SearchPopupMenuAndroid.cpp b/WebCore/platform/android/SearchPopupMenuAndroid.cpp
index fa976e7..0d67fdd 100644
--- a/WebCore/platform/android/SearchPopupMenuAndroid.cpp
+++ b/WebCore/platform/android/SearchPopupMenuAndroid.cpp
@@ -31,22 +31,22 @@ namespace WebCore {
 // Save the past searches stored in 'searchItems' to a database associated with 'name'
 void SearchPopupMenu::saveRecentSearches(const AtomicString& name, const Vector<String>& searchItems) 
 { 
-    //ASSERT(0); //notImplemented(); 
 }
 
 // Load past searches associated with 'name' from the database to 'searchItems'
 void SearchPopupMenu::loadRecentSearches(const AtomicString& name, Vector<String>& searchItems) 
 { 
-    //ASSERT(0); //notImplemented(); 
 }
 
 // Create a search popup menu - not sure what else we have to do here
-SearchPopupMenu::SearchPopupMenu(PopupMenuClient* client) : PopupMenu(client) 
+SearchPopupMenu::SearchPopupMenu(PopupMenuClient* client)
+    : PopupMenu(client) 
 { 
-    //ASSERT(0); //notImplemented(); 
 }
         
-// functions new to Jun-07 tip of tree merge:
-bool SearchPopupMenu::enabled() { return false; }
+bool SearchPopupMenu::enabled()
+{
+    return false;
+}
 
 }  // namespace WebCore
-- 
cgit v1.1