Moving common code into OmniboxView from OmniboxView*

chrome/browser/ui/views/omnibox/omnibox_view_win.h

Index: chrome/browser/ui/views/omnibox/omnibox_view_win.h
diff --git a/chrome/browser/ui/views/omnibox/omnibox_view_win.h b/chrome/browser/ui/views/omnibox/omnibox_view_win.h
index ce0e8cb67499975b88d0a8e472a25c314f3d61bf..61f54bfb153f2787d825a0d448f8f64c64367710 100644
--- a/chrome/browser/ui/views/omnibox/omnibox_view_win.h
+++ b/chrome/browser/ui/views/omnibox/omnibox_view_win.h
@@ -24,8 +24,6 @@
 #include "webkit/glue/window_open_disposition.h"
 
 class LocationBarView;
-class OmniboxEditController;
-class OmniboxEditModel;
 class OmniboxPopupView;
 
 namespace views {
@@ -37,14 +35,13 @@ class View;
 // Provides the implementation of an edit control with a drop-down
 // autocomplete box. The box itself is implemented in autocomplete_popup.cc
 // This file implements the edit box and management for the popup.
-class OmniboxViewWin
-    : public CWindowImpl<OmniboxViewWin,
-                         CRichEditCtrl,
-                         CWinTraits<WS_CHILD | WS_VISIBLE | ES_AUTOHSCROLL |
-                                    ES_NOHIDESEL> >,
-      public CRichEditCommands<OmniboxViewWin>,
-      public ui::SimpleMenuModel::Delegate,
-      public OmniboxView {
+typedef CWindowImpl<OmniboxViewWin, CRichEditCtrl,
+                    CWinTraits<WS_CHILD | WS_VISIBLE | ES_AUTOHSCROLL |
+                               ES_NOHIDESEL> > CWindowBase;
+class OmniboxViewWin : public CWindowBase,
+                       public CRichEditCommands<OmniboxViewWin>,
+                       public ui::SimpleMenuModel::Delegate,
+                       public OmniboxView {
  public:
   struct State {
     State(const CHARRANGE& selection,
@@ -75,10 +72,6 @@ class OmniboxViewWin
   views::View* parent_view() const;
 
   // OmniboxView:
-  virtual OmniboxEditModel* model() OVERRIDE { return model_.get(); }
-  virtual const OmniboxEditModel* model() const OVERRIDE {
-    return model_.get();
-  }
   virtual void SaveStateToTab(content::WebContents* tab) OVERRIDE;
   virtual void Update(
       const content::WebContents* tab_for_state_restoring) OVERRIDE;
@@ -87,9 +80,6 @@ class OmniboxViewWin
                          const GURL& alternate_nav_url,
                          size_t index) OVERRIDE;
   virtual string16 GetText() const OVERRIDE;
-  virtual bool IsEditingOrEmpty() const OVERRIDE;
-  virtual int GetIcon() const OVERRIDE;
-  virtual void SetUserText(const string16& text) OVERRIDE;
   virtual void SetUserText(const string16& text,
                            const string16& display_text,
                            bool update_popup) OVERRIDE;
@@ -105,7 +95,6 @@ class OmniboxViewWin
   virtual void SelectAll(bool reversed) OVERRIDE;
   virtual void RevertAll() OVERRIDE;
   virtual void UpdatePopup() OVERRIDE;
-  virtual void ClosePopup() OVERRIDE;
   virtual void SetFocus() OVERRIDE;
   virtual void OnTemporaryTextMaybeChanged(
       const string16& display_text,
@@ -117,7 +106,6 @@ class OmniboxViewWin
   virtual bool OnAfterPossibleChange() OVERRIDE;
   virtual gfx::NativeView GetNativeView() const OVERRIDE;
   virtual gfx::NativeView GetRelativeWindowForPopup() const OVERRIDE;
-  virtual CommandUpdater* GetCommandUpdater() OVERRIDE;
   virtual void SetInstantSuggestion(const string16& suggestion,
                                     bool animate_to_complete) OVERRIDE;
   virtual int TextWidth() const OVERRIDE;
@@ -200,9 +188,6 @@ class OmniboxViewWin
   virtual string16 GetLabelForCommandId(int command_id) const OVERRIDE;
   virtual void ExecuteCommand(int command_id) OVERRIDE;
 
-  // Returns true if the caret is at the end of the content.
-  bool IsCaretAtEnd() const;
-
  private:
   enum MouseButton {
     kLeft  = 0,
@@ -334,10 +319,12 @@ class OmniboxViewWin
   // click.  Sadly, we need to clip slightly differently in this case.
   LONG ClipXCoordToVisibleText(LONG x, bool is_triple_click) const;
 
+  virtual int GetOmniboxTextLength() OVERRIDE;
+
   // Parses the contents of the control for the scheme and the host name.
   // Highlights the scheme in green or red depending on it security level.
   // If a host name is found, it makes it visually stronger.
-  void EmphasizeURLComponents();
+  virtual void EmphasizeURLComponents() OVERRIDE;
 
   // Erases the portion of the selection in the font's y-adjustment area.  For
   // some reason the edit draws the selection rect here even though it's not
@@ -357,7 +344,7 @@ class OmniboxViewWin
                          const CRect& paint_clip_rect);
 
   // Internally invoked whenever the text changes in some way.
-  void TextChanged();
+  void TextChanged() OVERRIDE;
 
   // Getter for the text_object_model_.  Note that the pointer returned here is
   // only valid as long as the AutocompleteEdit is still alive.  Also, if the
@@ -397,22 +384,12 @@ class OmniboxViewWin
   // Common implementation for performing a drop on the edit view.
   int OnPerformDropImpl(const views::DropTargetEvent& event, bool in_drag);
 
-  scoped_ptr<OmniboxEditModel> model_;
-
   scoped_ptr<OmniboxPopupView> popup_view_;
 
-  OmniboxEditController* controller_;
-
   // The parent view for the edit, used to align the popup and for
   // accessibility.
   LocationBarView* parent_view_;
 
-  ToolbarModel* toolbar_model_;
-
-  // The object that handles additional command functionality exposed on the
-  // edit, such as invoking the keyword editor.
-  CommandUpdater* command_updater_;
-
   // When true, the location bar view is read only and also is has a slightly
   // different presentation (font size / color). This is used for popups.
   bool popup_window_mode_;