Refactor AutocompleteEditViewGtk so that AutocompleteEditView impl can be swapped.

chrome/browser/ui/views/location_bar/location_bar_view.h

Index: chrome/browser/ui/views/location_bar/location_bar_view.h
diff --git a/chrome/browser/ui/views/location_bar/location_bar_view.h b/chrome/browser/ui/views/location_bar/location_bar_view.h
index 317bd788dd3b001fbbf36dd7f0fa8ca7943aed4a..b437cf98d6fe6a80b3efc0fdb932438ade76078b 100644
--- a/chrome/browser/ui/views/location_bar/location_bar_view.h
+++ b/chrome/browser/ui/views/location_bar/location_bar_view.h
@@ -25,9 +25,8 @@
 
 #if defined(OS_WIN)
 #include "chrome/browser/autocomplete/autocomplete_edit_view_win.h"
-#else
+#elif defined(OS_LINUX)
 #include "chrome/browser/autocomplete/autocomplete_edit_view_gtk.h"
-#include "chrome/browser/gtk/accessible_widget_helper_gtk.h"
 #endif
 
 class CommandUpdater;
@@ -46,15 +45,15 @@ class TabContents;
 class TabContentsWrapper;
 class TemplateURLModel;
 
+#if defined(OS_WIN)

[Peter Kasting, 2011/01/06 02:06:48]

Nit: Leave this section where it was (Chrome convention is to put #if XXX
declarations below all others).

[oshima, 2011/01/06 19:43:35]

Done.

+class SuggestedTextView;
+#endif
+
 namespace views {
 class HorizontalPainter;
 class Label;
 };
 
-#if defined(OS_WIN)
-class SuggestedTextView;
-#endif
-
 /////////////////////////////////////////////////////////////////////////////
 //
 // LocationBarView class
@@ -315,10 +314,10 @@ class LocationBarView : public LocationBar,
 #if defined(OS_WIN)
   // Helper for the Mouse event handlers that does all the real work.
   void OnMouseEvent(const views::MouseEvent& event, UINT msg);
+#endif
 
   // Returns true if the suggest text is valid.
   bool HasValidSuggestText();
-#endif
 
   // Helper to show the first run info bubble.
   void ShowFirstRunBubbleInternal(FirstRun::BubbleType bubble_type);
@@ -330,7 +329,7 @@ class LocationBarView : public LocationBar,
 #if defined(OS_WIN)
   scoped_ptr<AutocompleteEditViewWin> location_entry_;
 #else
-  scoped_ptr<AutocompleteEditViewGtk> location_entry_;
+  scoped_ptr<AutocompleteEditView> location_entry_;
 #endif
 
   // The CommandUpdater for the Browser object that corresponds to this View.
@@ -364,8 +363,8 @@ class LocationBarView : public LocationBar,
   // A bubble displayed for EV HTTPS sites.
   EVBubbleView* ev_bubble_view_;
 
-  // Location_entry view wrapper
-  views::NativeViewHost* location_entry_view_;
+  // Location_entry view
+  views::View* location_entry_view_;
 
   // The following views are used to provide hints and remind the user as to
   // what is going in the edit. They are all added a children of the
@@ -409,10 +408,6 @@ class LocationBarView : public LocationBar,
   // crash.
   TemplateURLModel* template_url_model_;
 
-#if defined(OS_LINUX)
-  scoped_ptr<AccessibleWidgetHelper> accessible_widget_helper_;
-#endif
-
   // Should instant be updated? This is set to false in OnAutocompleteWillAccept
   // and true in OnAutocompleteAccept. This is needed as prior to accepting an
   // autocomplete suggestion the model is reverted which triggers resetting