Moving common code into OmniboxView from OmniboxView*

chrome/browser/ui/views/omnibox/omnibox_view_views.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_VIEWS_H_
 #define CHROME_BROWSER_UI_VIEWS_OMNIBOX_OMNIBOX_VIEW_VIEWS_H_
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 #include "chrome/browser/ui/omnibox/omnibox_view.h"
 #include "chrome/browser/ui/toolbar/toolbar_model.h"
 #include "ui/base/range/range.h"
 #include "ui/views/controls/textfield/textfield_controller.h"
 #include "ui/views/view.h"
 #include "webkit/glue/window_open_disposition.h"
 
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/chromeos/input_method/input_method_manager.h"
 #endif
 
 class LocationBarView;
-class OmniboxEditController;
-class OmniboxEditModel;
 class OmniboxPopupView;
 class Profile;
 
 namespace ui {
 class OSExchangeData;
 }  // namespace ui
 
 // Views-implementation of OmniboxView. This is based on gtk implementation.
 // The following features are not yet supported.
 //
@@ skipping 51 matching lines @@
   // the root view.
   bool IsLocationEntryFocusableInRootView() const;
 
   // Implements views::View
   virtual void Layout() OVERRIDE;
   virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE;
   virtual std::string GetClassName() const OVERRIDE;
   virtual void OnBoundsChanged(const gfx::Rect& previous_bounds) OVERRIDE;
 
   // OmniboxView:
-  virtual OmniboxEditModel* model() OVERRIDE;
-  virtual const OmniboxEditModel* model() const OVERRIDE;
   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 selected_line) 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& input,
                                     bool animate_to_complete) OVERRIDE;
   virtual string16 GetInstantSuggestion() const OVERRIDE;
   virtual int TextWidth() 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 16 matching lines @@
 #if defined(OS_CHROMEOS)
   // chromeos::input_method::InputMethodManager::CandidateWindowObserver:
   virtual void CandidateWindowOpened(
       chromeos::input_method::InputMethodManager* manager) OVERRIDE;
   virtual void CandidateWindowClosed(
       chromeos::input_method::InputMethodManager* manager) OVERRIDE;
 #endif
 
  private:
   // Return the number of characers in the current buffer.
+  virtual int GetOmniboxTextLength() const OVERRIDE;
   size_t GetTextLength() const;
 
   // Try to parse the current text as a URL and colorize the components.
-  void EmphasizeURLComponents();
-
-  // Internally invoked whenever the text changes in some way.
-  void TextChanged();
+  virtual void EmphasizeURLComponents() OVERRIDE;
 
   // Update the field with |text| and set the selection.
   void SetTextAndSelectedRange(const string16& text,
                                const ui::Range& range);
 
   // Returns the selected text.
   string16 GetSelectedText() const;
 
   views::Textfield* textfield_;
 
   // When true, the location bar view is read only and also is has a slightly
   // different presentation (smaller font size). This is used for popups.
   bool popup_window_mode_;
 
-  scoped_ptr<OmniboxEditModel> model_;
   scoped_ptr<OmniboxPopupView> popup_view_;
-  OmniboxEditController* controller_;
-  ToolbarModel* toolbar_model_;
-
-  // The object that handles additional command functionality exposed on the
-  // edit, such as invoking the keyword editor.
-  CommandUpdater* command_updater_;
 
   ToolbarModel::SecurityLevel security_level_;
 
   // Selection at the point where the user started using the
   // arrows to move around in the popup.
   ui::Range saved_temporary_selection_;
 
   // Tracking state before and after a possible change.
   string16 text_before_change_;
   ui::Range sel_before_change_;
@@ skipping 11 matching lines @@
   // Should we select all the text when we see the mouse button get released?
   // We select in response to a click that focuses the omnibox, but we defer
   // until release, setting this variable back to false if we saw a drag, to
   // allow the user to select just a portion of the text.
   bool select_all_on_mouse_release_;
 
   DISALLOW_COPY_AND_ASSIGN(OmniboxViewViews);
 };
 
 #endif  // CHROME_BROWSER_UI_VIEWS_OMNIBOX_OMNIBOX_VIEW_VIEWS_H_