Moving common code into OmniboxView from OmniboxView*

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

 // Copyright (c) 2012 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.
 
 #ifndef CHROME_BROWSER_UI_VIEWS_OMNIBOX_OMNIBOX_VIEW_WIN_H_
 #define CHROME_BROWSER_UI_VIEWS_OMNIBOX_OMNIBOX_VIEW_WIN_H_
 
 #include <atlbase.h>
 #include <atlapp.h>
 #include <atlcrack.h>
 #include <atlctrls.h>
 #include <atlmisc.h>
 #include <peninputpanel.h>
 #include <tom.h>  // For ITextDocument, a COM interface to CRichEditCtrl.
 
 #include "base/memory/scoped_ptr.h"
 #include "base/win/scoped_comptr.h"
 #include "chrome/browser/ui/omnibox/omnibox_view.h"
 #include "chrome/browser/ui/toolbar/toolbar_model.h"
 #include "chrome/browser/ui/views/omnibox/omnibox_popup_contents_view.h"
 #include "ui/base/models/simple_menu_model.h"
 #include "ui/base/win/extra_sdk_defines.h"
 #include "ui/gfx/font.h"
 #include "webkit/glue/window_open_disposition.h"
 
 class LocationBarView;
-class OmniboxEditController;
-class OmniboxEditModel;
 class OmniboxPopupView;
 
 namespace views {
 class MenuRunner;
 class NativeViewHost;
 class View;
 }
 
 // Provides the implementation of an edit control with a drop-down
 // autocomplete box. The box itself is implemented in autocomplete_popup.cc
@@ skipping 29 matching lines @@
                  views::View* popup_parent_view);
   ~OmniboxViewWin();
 
   // Gets the relative window for the specified native view.
   static gfx::NativeView GetRelativeWindowForNativeView(
       gfx::NativeView edit_native_view);
 
   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;
   virtual void OpenMatch(const AutocompleteMatch& match,
                          WindowOpenDisposition disposition,
                          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;
   virtual void SetWindowTextAndCaretPos(const string16& text,
                                         size_t caret_pos,
                                         bool update_popup,
                                         bool notify_text_changed) OVERRIDE;
   virtual void SetForcedQuery() OVERRIDE;
   virtual bool IsSelectAll() const OVERRIDE;
   virtual bool DeleteAtEndPressed() OVERRIDE;
   virtual void GetSelectionBounds(string16::size_type* start,
                                   string16::size_type* end) const OVERRIDE;
   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,
       bool save_original_selection) OVERRIDE;
   virtual bool OnInlineAutocompleteTextMaybeChanged(
       const string16& display_text, size_t user_text_length) OVERRIDE;
   virtual void OnRevertTemporaryText() OVERRIDE;
   virtual void OnBeforePossibleChange() OVERRIDE;
   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;
   virtual string16 GetInstantSuggestion() const OVERRIDE;
   virtual bool IsImeComposing() const OVERRIDE;
   virtual int GetMaxEditWidth(int entry_width) const OVERRIDE;
   virtual views::View* AddToView(views::View* parent) OVERRIDE;
   virtual int OnPerformDrop(const views::DropTargetEvent& event) OVERRIDE;
   virtual gfx::Font GetFont() OVERRIDE;
   virtual int WidthOfTextAfterCursor() OVERRIDE;
@@ skipping 62 matching lines @@
   // ui::SimpleMenuModel::Delegate
   virtual bool IsCommandIdChecked(int command_id) const OVERRIDE;
   virtual bool IsCommandIdEnabled(int command_id) const OVERRIDE;
   virtual bool GetAcceleratorForCommandId(
       int command_id,
       ui::Accelerator* accelerator) OVERRIDE;
   virtual bool IsItemForCommandIdDynamic(int command_id) const OVERRIDE;
   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,
     kRight = 1,
   };
 
   // This object freezes repainting of the edit until the object is destroyed.
   // Some methods of the CRichEditCtrl draw synchronously to the screen.  If we
   // don't freeze, the user will see a rapid series of calls to these as
   // flickers.
@@ skipping 111 matching lines @@
   // clipped to be within the horizontal bounds of the visible text.
   //
   // This is used in our mouse handlers to work around quirky behaviors of the
   // underlying CRichEditCtrl like not supporting triple-click when the user
   // doesn't click on the text itself.
   //
   // |is_triple_click| should be true iff this is the third click of a triple
   // click.  Sadly, we need to clip slightly differently in this case.
   LONG ClipXCoordToVisibleText(LONG x, bool is_triple_click) const;
 
+  virtual int GetOmniboxTextLength() const 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
   // part of the font.
   void EraseTopOfSelection(CDC* dc,
                            const CRect& client_rect,
                            const CRect& paint_clip_rect);
 
   // Draws a slash across the scheme if desired.
   void DrawSlashForInsecureScheme(HDC hdc,
                                   const CRect& client_rect,
                                   const CRect& paint_clip_rect);
 
   // Renders the drop highlight.
   void DrawDropHighlight(HDC hdc,
                          const CRect& client_rect,
                          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
   // underlying call fails, this may return NULL.
   ITextDocument* GetTextObjectModel() const;
 
   // Invoked during a mouse move. As necessary starts a drag and drop session.
   void StartDragIfNecessary(const CPoint& point);
 
   // Invoked during a mouse down. If the mouse location is over the selection
@@ skipping 19 matching lines @@
   int WidthNeededToDisplay(const string16& text) const;
 
   // Real implementation of OnAfterPossibleChange() method.
   // If |force_text_changed| is true, then the text_changed code will always be
   // triggerred no matter if the text is actually changed or not.
   bool OnAfterPossibleChangeInternal(bool force_text_changed);
 
   // 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_;
 
   // True if we should prevent attempts to make the window visible when we
   // handle WM_WINDOWPOSCHANGING.  While toggling fullscreen mode, the main
   // window is hidden, and if the edit is shown it will draw over the main
   // window when that window reappears.
   bool force_hidden_;
 
@@ skipping 95 matching lines @@
   // Instance of accessibility information and handling.
   mutable base::win::ScopedComPtr<IAccessible> autocomplete_accessibility_;
 
   // The native view host.
   views::NativeViewHost* native_view_host_;
 
   DISALLOW_COPY_AND_ASSIGN(OmniboxViewWin);
 };
 
 #endif  // CHROME_BROWSER_UI_VIEWS_OMNIBOX_OMNIBOX_VIEW_WIN_H_