Moving common code into OmniboxView from OmniboxView*

chrome/browser/ui/gtk/omnibox/omnibox_view_gtk.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_GTK_OMNIBOX_OMNIBOX_VIEW_GTK_H_
 #define CHROME_BROWSER_UI_GTK_OMNIBOX_OMNIBOX_VIEW_GTK_H_
 
 #include <gtk/gtk.h>
 
 #include <algorithm>
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/string_util.h"
 #include "chrome/browser/ui/omnibox/omnibox_view.h"
 #include "chrome/browser/ui/toolbar/toolbar_model.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 #include "ui/base/animation/animation_delegate.h"
 #include "ui/base/gtk/gtk_signal.h"
 #include "ui/base/gtk/gtk_signal_registrar.h"
 #include "ui/base/gtk/owned_widget_gtk.h"
 #include "ui/gfx/rect.h"
 #include "webkit/glue/window_open_disposition.h"
 
 class Browser;
-class OmniboxEditController;
-class OmniboxEditModel;
 class OmniboxPopupView;
 class Profile;
 
 namespace gfx {
 class Font;
 }
 
 namespace ui {
 class MultiAnimation;
 }
@@ skipping 29 matching lines @@
   virtual ~OmniboxViewGtk();
 
   // Initialize, create the underlying widgets, etc.
   void Init();
   // 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.
   int WidthOfTextAfterCursor();
 
   // 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 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 string16 GetInstantSuggestion() const OVERRIDE;
   virtual int TextWidth() const OVERRIDE;
   virtual bool IsImeComposing() const OVERRIDE;
 
   // Overridden from content::NotificationObserver:
   virtual void Observe(int type,
                        const content::NotificationSource& source,
                        const content::NotificationDetails& details) OVERRIDE;
@@ skipping 97 matching lines @@
   static void ClipboardGetSelectionThunk(GtkClipboard* clipboard,
                                          GtkSelectionData* selection_data,
                                          guint info,
                                          gpointer object);
   void ClipboardGetSelection(GtkClipboard* clipboard,
                              GtkSelectionData* selection_data,
                              guint info);
 
   void HandleCopyOrCutClipboard(bool copy);
 
+  // OmniboxView overrides.

[Peter Kasting, 2012/07/26 23:03:24]

Nit: Still seems kind of randomly located.  Maybe above or below the
CHROMEGTK_CALLBACK list?  I don't know if we have any consistency elsewhere.

[dominich, 2012/07/27 20:33:54]

my thinking was:

below callbacks.
below static method.
below non-static methods relating to static method.

[Peter Kasting, 2012/07/28 00:23:06]

Yeah, I'd probably put it above the static method, but it's not a big deal at
all.  Whatever works.

+  virtual int GetOmniboxTextLength() const OVERRIDE;
+  virtual void EmphasizeURLComponents() OVERRIDE;
+
   // Common implementation for performing a drop on the edit view.
   bool OnPerformDropImpl(const string16& text);
 
   // Returns the font used in |text_view_|.
   gfx::Font GetFont();
 
   // Take control of the PRIMARY selection clipboard with |text|. Use
   // |text_buffer_| as the owner, so that this doesn't remove the selection on
   // it. This makes use of the above callbacks.
   void OwnPrimarySelection(const std::string& text);
@@ skipping 19 matching lines @@
 
   // Get the character indices of the current selection.  This honors
   // direction, cp_max is the insertion point, and cp_min is the bound.
   CharRange GetSelection() const;
 
   // Translate from character positions to iterators for the current buffer.
   void ItersFromCharRange(const CharRange& range,
                           GtkTextIter* iter_min,
                           GtkTextIter* iter_max);
 
-  // Return the number of characters in the current buffer.
-  int GetTextLength() const;
-
-  // Places the caret at the given position. This clears any selection.
-  void PlaceCaretAt(int pos);
-
   // Returns true if the caret is at the end of the content.
   bool IsCaretAtEnd() 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();
-
   // Save |selected_text| as the PRIMARY X selection. Unlike
   // OwnPrimarySelection(), this won't set an owner or use callbacks.
   void SavePrimarySelection(const std::string& selected_text);
 
   // Update the field with |text| and set the selection.
   void SetTextAndSelectedRange(const string16& text,
                                const CharRange& range);
 
   // Set the selection to |range|.
   void SetSelectedRange(const CharRange& range);
@@ skipping 56 matching lines @@
   GtkWidget* instant_view_;
   // Animation from instant suggest (faded text) to autocomplete (selected
   // text).
   scoped_ptr<ui::MultiAnimation> instant_animation_;
 
   // A mark to split the content and the instant anchor. Wherever the end
   // iterator of the text buffer is required, the iterator to this mark should
   // be used.
   GtkTextMark* instant_mark_;
 
-  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_;
 
   // 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_;
 
   ToolbarModel::SecurityLevel security_level_;
 
   // Selection at the point where the user started using the
   // arrows to move around in the popup.
   CharRange saved_temporary_selection_;
@@ skipping 110 matching lines @@
   // The view that is going to be focused next. Only valid while handling
   // "focus-out" events.
   GtkWidget* going_to_focus_;
 
   ui::GtkSignalRegistrar signals_;
 
   DISALLOW_COPY_AND_ASSIGN(OmniboxViewGtk);
 };
 
 #endif  // CHROME_BROWSER_UI_GTK_OMNIBOX_OMNIBOX_VIEW_GTK_H_