Refactor AutocompleteEditViewGtk so that AutocompleteEditView impl can be swapped.

chrome/browser/autocomplete/autocomplete_edit_view.h

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // This file defines the interface class AutocompleteEditView.  Each toolkit
 // will implement the edit view differently, so that code is inherently
 // platform specific.  However, the AutocompleteEditModel needs to do some
 // communication with the view.  Since the model is shared between platforms,
 // we need to define an interface that all view implementations will share.
 
 #ifndef CHROME_BROWSER_AUTOCOMPLETE_AUTOCOMPLETE_EDIT_VIEW_H_
 #define CHROME_BROWSER_AUTOCOMPLETE_AUTOCOMPLETE_EDIT_VIEW_H_
 #pragma once
 
 #include <string>
 
 #include "base/string16.h"
 #include "chrome/common/page_transition_types.h"
 #include "gfx/native_widget_types.h"
 #include "webkit/glue/window_open_disposition.h"
 
 class AutocompleteEditModel;
 class CommandUpdater;
 class GURL;
 class TabContents;
 
+#if defined(TOOLKIT_VIEWS)
+namespace views {
+class View;
+}  // namespace views
+#endif
+
 class AutocompleteEditView {
  public:
   // Used by the automation system for getting at the model from the view.
   virtual AutocompleteEditModel* model() = 0;
   virtual const AutocompleteEditModel* model() const = 0;
 
   // For use when switching tabs, this saves the current state onto the tab so
   // that it can be restored during a later call to Update().
   virtual void SaveStateToTab(TabContents* tab) = 0;
 
@@ skipping 108 matching lines @@
   // OnAfterPossibleChange() returns true if there was a change that caused it
   // to call UpdatePopup().
   virtual bool OnAfterPossibleChange() = 0;
 
   // Returns the gfx::NativeView of the edit view.
   virtual gfx::NativeView GetNativeView() const = 0;
 
   // Returns the command updater for this view.
   virtual CommandUpdater* GetCommandUpdater() = 0;
 
- protected:
+#if defined(TOOLKIT_VIEWS)
+  // Adds the autocomplete edit view to view hierarchy and
+  // returns the views::View of the edit view.
+  virtual views::View* AddToView(views::View* parent) = 0;
+
+  // Returns the width in pixels needed to display the current text. The

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

Nit: Might want to move this to the end so that the declaration order in
AutocompleteEditViewGtk will match?  (Also updating the Windows declaration too)

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

Done. moved implementation as well.

+  // returned value includes margins.
+  virtual int TextWidth() const = 0;
+
+  // Commits the suggested text.
+  virtual bool CommitInstantSuggestion(const std::wstring& typed_text,
+                                       const std::wstring& suggested_text) = 0;
+
+  // Shows the instant suggestion text.
+  virtual void SetInstantSuggestion(const string16& input) = 0;
+#endif
+
   virtual ~AutocompleteEditView() {}
 };
 
 #endif  // CHROME_BROWSER_AUTOCOMPLETE_AUTOCOMPLETE_EDIT_VIEW_H_