Refactor AutocompleteEditViewGtk so that AutocompleteEditView impl can be swapped.

chrome/browser/autocomplete/autocomplete_edit_view_gtk.h

Index: chrome/browser/autocomplete/autocomplete_edit_view_gtk.h
diff --git a/chrome/browser/autocomplete/autocomplete_edit_view_gtk.h b/chrome/browser/autocomplete/autocomplete_edit_view_gtk.h
index dc09d9143779d37b8728d7b5f9fc01744ecdea97..592bb617ad07ac81a0e978b492aa7028a837d2d2 100644
--- a/chrome/browser/autocomplete/autocomplete_edit_view_gtk.h
+++ b/chrome/browser/autocomplete/autocomplete_edit_view_gtk.h
@@ -26,6 +26,7 @@
 #include "gfx/rect.h"
 #include "webkit/glue/window_open_disposition.h"
 
+class AccessibleWidgetHelper;
 class AutocompleteEditController;
 class AutocompleteEditModel;
 class AutocompletePopupView;
@@ -71,19 +72,15 @@ class AutocompleteEditViewGtk : public AutocompleteEditView,
                           CommandUpdater* command_updater,
                           bool popup_window_mode,
 #if defined(TOOLKIT_VIEWS)
-                          const views::View* location_bar);
+                          const views::View* location_bar
 #else
-                          GtkWidget* location_bar);
+                          GtkWidget* location_bar
 #endif
-  ~AutocompleteEditViewGtk();
+                          );
+  virtual ~AutocompleteEditViewGtk();
 
   // Initialize, create the underlying widgets, etc.
   void Init();
-
-  // Returns the width in pixels needed to display the current text. The
-  // returned value includes margins.
-  int TextWidth();
-
   // Returns the width in pixels needed to display the text from one character
   // before the caret to the end of the string. See comments in
   // LocationBarView::Layout as to why this uses -1.
@@ -143,6 +140,27 @@ class AutocompleteEditViewGtk : public AutocompleteEditView,
   virtual bool OnAfterPossibleChange();
   virtual gfx::NativeView GetNativeView() const;
   virtual CommandUpdater* GetCommandUpdater();
+#if defined(TOOLKIT_VIEWS)
+  virtual views::View* AddToView(views::View* parent);
+  virtual bool CommitInstantSuggestion(const std::wstring& typed_text,
+                                       const std::wstring& suggested_text);
+  virtual void SetInstantSuggestion(const string16& suggestion);
+
+  // Enables accessibility on AutocompleteEditView.
+  void EnableAccessibility();
+
+  // A factory method to creates AutocompleteEditView instance initialized for

[Peter Kasting, 2011/01/06 20:51:38]

Nit: "creates" -> "create an"

[oshima, 2011/01/06 21:39:27]

Done.

+  // linux_views.  This currently returns an instance of
+  // AutocompleteEditViewGtk only, but AutocompleteEditViewViews will
+  // be added to an option when TextfieldViews is enabled.

[Peter Kasting, 2011/01/06 20:51:38]

Nit: "to" -> "as"

[oshima, 2011/01/06 21:39:27]

Done.

+  static AutocompleteEditView* Create(AutocompleteEditController* controller,
+                                      ToolbarModel* toolbar_model,
+                                      Profile* profile,
+                                      CommandUpdater* command_updater,
+                                      bool popup_window_mode,
+                                      const views::View* location_bar);
+#endif
+  virtual int TextWidth() const;
 
   // Overridden from NotificationObserver:
   virtual void Observe(NotificationType type,
@@ -514,6 +532,10 @@ class AutocompleteEditViewGtk : public AutocompleteEditView,
 
   GtkSignalRegistrar signals_;
 
+#if defined(TOOLKIT_VIEWS)
+  scoped_ptr<AccessibleWidgetHelper> accessible_widget_helper_;
+#endif
+
   DISALLOW_COPY_AND_ASSIGN(AutocompleteEditViewGtk);
 };