Moving common code into OmniboxView from OmniboxView*

chrome/browser/ui/gtk/omnibox/omnibox_view_gtk.cc

 // 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.
 
 #include "chrome/browser/ui/gtk/omnibox/omnibox_view_gtk.h"
 
 #include <gdk/gdkkeysyms.h>
 #include <gtk/gtk.h>
 
 #include <algorithm>
@@ skipping 142 matching lines @@
 }
 
 }  // namespace
 
 OmniboxViewGtk::OmniboxViewGtk(OmniboxEditController* controller,
                                ToolbarModel* toolbar_model,
                                Browser* browser,
                                CommandUpdater* command_updater,
                                bool popup_window_mode,
                                GtkWidget* location_bar)
-    : browser_(browser),
+    : OmniboxView(browser->profile(), controller, toolbar_model,
+                  command_updater),
+      browser_(browser),
       text_view_(NULL),
       tag_table_(NULL),
       text_buffer_(NULL),
       faded_text_tag_(NULL),
       secure_scheme_tag_(NULL),
       security_error_scheme_tag_(NULL),
       normal_text_tag_(NULL),
       instant_anchor_tag_(NULL),
       instant_view_(NULL),
       instant_mark_(NULL),
-      model_(new OmniboxEditModel(this, controller, browser->profile())),
-      controller_(controller),
-      toolbar_model_(toolbar_model),
-      command_updater_(command_updater),
       popup_window_mode_(popup_window_mode),
       security_level_(ToolbarModel::NONE),
       mark_set_handler_id_(0),
       button_1_pressed_(false),
       theme_service_(GtkThemeService::GetFrom(browser->profile())),
       enter_was_pressed_(false),
       tab_was_pressed_(false),
       paste_clipboard_requested_(false),
       enter_was_inserted_(false),
       selection_suggested_(false),
@@ skipping 227 matching lines @@
 void OmniboxViewGtk::SetFocus() {
   DCHECK(text_view_);
   gtk_widget_grab_focus(text_view_);
 }
 
 int OmniboxViewGtk::WidthOfTextAfterCursor() {
   // Not used.
   return -1;
 }
 
-OmniboxEditModel* OmniboxViewGtk::model() {
-  return model_.get();
-}
-
-const OmniboxEditModel* OmniboxViewGtk::model() const {
-  return model_.get();
-}
-
 void OmniboxViewGtk::SaveStateToTab(WebContents* tab) {
   DCHECK(tab);
   // If any text has been selected, register it as the PRIMARY selection so it
   // can still be pasted via middle-click after the text view is cleared.
   if (!selected_text_.empty())
     SavePrimarySelection(selected_text_);
   // NOTE: GetStateForTabSwitch may affect GetSelection, so order is important.
   OmniboxEditModel::State model_state = model_->GetStateForTabSwitch();
   GetStateAccessor()->SetProperty(
       tab->GetPropertyBag(),
@@ skipping 25 matching lines @@
       FinishUpdatingHighlightedText();
     }
   } else if (visibly_changed_permanent_text) {
     RevertAll();
     // TODO(deanm): There should be code to restore select all here.
   } else if (changed_security_level) {
     EmphasizeURLComponents();
   }
 }
 
-void OmniboxViewGtk::OpenMatch(const AutocompleteMatch& match,
-                               WindowOpenDisposition disposition,
-                               const GURL& alternate_nav_url,
-                               size_t selected_line) {
-  if (!match.destination_url.is_valid())
-    return;
-
-  model_->OpenMatch(match, disposition, alternate_nav_url, selected_line);
-}
-
 string16 OmniboxViewGtk::GetText() const {
   GtkTextIter start, end;
   GetTextBufferBounds(&start, &end);
   gchar* utf8 = gtk_text_buffer_get_text(text_buffer_, &start, &end, false);
   string16 out(UTF8ToUTF16(utf8));
   g_free(utf8);
 
   if (supports_pre_edit_) {
     // We need to treat the text currently being composed by the input method
     // as part of the text content, so that omnibox can work correctly in the
     // middle of composition.
     if (pre_edit_.size()) {
       GtkTextMark* mark = gtk_text_buffer_get_insert(text_buffer_);
       gtk_text_buffer_get_iter_at_mark(text_buffer_, &start, mark);
       out.insert(gtk_text_iter_get_offset(&start), pre_edit_);
     }
   }
   return out;
 }
 
-bool OmniboxViewGtk::IsEditingOrEmpty() const {
-  return model_->user_input_in_progress() || (GetTextLength() == 0);
-}
-
-int OmniboxViewGtk::GetIcon() const {
-  return IsEditingOrEmpty() ?
-      AutocompleteMatch::TypeToIcon(model_->CurrentTextType()) :
-      toolbar_model_->GetIcon();
-}
-
-void OmniboxViewGtk::SetUserText(const string16& text) {
-  SetUserText(text, text, true);
-}
-
-void OmniboxViewGtk::SetUserText(const string16& text,
-                                 const string16& display_text,
-                                 bool update_popup) {
-  model_->SetUserText(text);
-  // TODO(deanm): something about selection / focus change here.
-  SetWindowTextAndCaretPos(display_text, display_text.length(), update_popup,
-      true);
-}
-
 void OmniboxViewGtk::SetWindowTextAndCaretPos(const string16& text,
                                               size_t caret_pos,
                                               bool update_popup,
                                               bool notify_text_changed) {
   CharRange range(static_cast<int>(caret_pos), static_cast<int>(caret_pos));
   SetTextAndSelectedRange(text, range);
 
   if (update_popup)
     UpdatePopup();
 
@@ skipping 36 matching lines @@
   *end = static_cast<size_t>(selection.cp_max);
 }
 
 void OmniboxViewGtk::SelectAll(bool reversed) {
   // SelectAll() is invoked as a side effect of other actions (e.g.  switching
   // tabs or hitting Escape) in autocomplete_edit.cc, so we don't update the
   // PRIMARY selection here.
   SelectAllInternal(reversed, false);
 }
 
-void OmniboxViewGtk::RevertAll() {
-  ClosePopup();
-  model_->Revert();
-  TextChanged();
-}
-
 void OmniboxViewGtk::UpdatePopup() {
   model_->SetInputInProgress(true);
   if (!update_popup_without_focus_ && !model_->has_focus())
     return;
 
   // Don't inline autocomplete when the caret/selection isn't at the end of
   // the text, or in the middle of composition.
   CharRange sel = GetSelection();
   bool no_inline_autocomplete =
-      std::max(sel.cp_max, sel.cp_min) < GetTextLength() || IsImeComposing();
+      std::max(sel.cp_max, sel.cp_min) < GetOmniboxTextLength() ||
+      IsImeComposing();
   model_->StartAutocomplete(sel.cp_min != sel.cp_max, no_inline_autocomplete);
 }
 
-void OmniboxViewGtk::ClosePopup() {
-  model_->StopAutocomplete();
-}
-
 void OmniboxViewGtk::OnTemporaryTextMaybeChanged(
     const string16& display_text,
     bool save_original_selection) {
   if (save_original_selection)
     saved_temporary_selection_ = GetSelection();
 
   StartUpdatingHighlightedText();
   SetWindowTextAndCaretPos(display_text, display_text.length(), false, false);
   FinishUpdatingHighlightedText();
   TextChanged();
@@ skipping 55 matching lines @@
   // {Start|Finish}UpdatingHighlightedText() are called here to prevent the
   // PRIMARY selection from being changed.
   if (enter_was_pressed_ && enter_was_inserted_) {
     StartUpdatingHighlightedText();
     SetTextAndSelectedRange(text_before_change_, sel_before_change_);
     FinishUpdatingHighlightedText();
     return false;
   }
 
   const CharRange new_sel = GetSelection();
-  const int length = GetTextLength();
+  const int length = GetOmniboxTextLength();
   const bool selection_differs =
       ((new_sel.cp_min != new_sel.cp_max) ||
        (sel_before_change_.cp_min != sel_before_change_.cp_max)) &&
       ((new_sel.cp_min != sel_before_change_.cp_min) ||
        (new_sel.cp_max != sel_before_change_.cp_max));
   const bool at_end_of_edit =
       (new_sel.cp_min == length && new_sel.cp_max == length);
 
   // See if the text or selection have changed since OnBeforePossibleChange().
   const string16 new_text(GetText());
@@ skipping 40 matching lines @@
 gfx::NativeView OmniboxViewGtk::GetNativeView() const {
   return alignment_.get();
 }
 
 gfx::NativeView OmniboxViewGtk::GetRelativeWindowForPopup() const {
   GtkWidget* toplevel = gtk_widget_get_toplevel(GetNativeView());
   DCHECK(gtk_widget_is_toplevel(toplevel));
   return toplevel;
 }
 
-CommandUpdater* OmniboxViewGtk::GetCommandUpdater() {
-  return command_updater_;
-}
-
 void OmniboxViewGtk::SetInstantSuggestion(const string16& suggestion,
                                           bool animate_to_complete) {
   std::string suggestion_utf8 = UTF16ToUTF8(suggestion);
 
   gtk_label_set_text(GTK_LABEL(instant_view_), suggestion_utf8.c_str());
 
   StopAnimation();
 
   if (suggestion.empty()) {
     gtk_widget_hide(instant_view_);
@@ skipping 1116 matching lines @@
 }
 
 void OmniboxViewGtk::ItersFromCharRange(const CharRange& range,
                                         GtkTextIter* iter_min,
                                         GtkTextIter* iter_max) {
   DCHECK(!IsImeComposing());
   gtk_text_buffer_get_iter_at_offset(text_buffer_, iter_min, range.cp_min);
   gtk_text_buffer_get_iter_at_offset(text_buffer_, iter_max, range.cp_max);
 }
 
-int OmniboxViewGtk::GetTextLength() const {
+int OmniboxViewGtk::GetOmniboxTextLength() const {
   GtkTextIter end;
   gtk_text_buffer_get_iter_at_mark(text_buffer_, &end, instant_mark_);
   if (supports_pre_edit_) {
     // We need to count the length of the text being composed, because we treat
     // it as part of the content in GetText().
     return gtk_text_iter_get_offset(&end) + pre_edit_.size();
   }
   return gtk_text_iter_get_offset(&end);
 }
 
-void OmniboxViewGtk::PlaceCaretAt(int pos) {
-  GtkTextIter cursor;
-  gtk_text_buffer_get_iter_at_offset(text_buffer_, &cursor, pos);
-  gtk_text_buffer_place_cursor(text_buffer_, &cursor);
-}
-
 bool OmniboxViewGtk::IsCaretAtEnd() const {
   const CharRange selection = GetSelection();
   return selection.cp_min == selection.cp_max &&
-      selection.cp_min == GetTextLength();
+      selection.cp_min == GetOmniboxTextLength();
 }
 
 void OmniboxViewGtk::EmphasizeURLComponents() {
   if (supports_pre_edit_) {
     // We can't change the text style easily, if the pre-edit string (the text
     // being composed by the input method) is not empty, which is not treated as
     // a part of the text content inside GtkTextView. And it's ok to simply
     // return in this case, as this method will be called again when the
     // pre-edit string gets committed.
     if (pre_edit_.size()) {
@@ skipping 57 matching lines @@
   }
 }
 
 void OmniboxViewGtk::StopAnimation() {
   // Clear the animation delegate so we don't get an AnimationEnded() callback.
   instant_animation_->set_delegate(NULL);
   instant_animation_->Stop();
   UpdateInstantViewColors();
 }
 
-void OmniboxViewGtk::TextChanged() {
-  EmphasizeURLComponents();
-  model_->OnChanged();
-}
-
 void OmniboxViewGtk::SavePrimarySelection(const std::string& selected_text) {
   DCHECK(text_view_);
 
   GtkClipboard* clipboard =
       gtk_widget_get_clipboard(text_view_, GDK_SELECTION_PRIMARY);
   DCHECK(clipboard);
   if (!clipboard)
     return;
 
   gtk_clipboard_set_text(
@@ skipping 243 matching lines @@
 void OmniboxViewGtk::AdjustVerticalAlignmentOfInstantView() {
   // By default, GtkTextView layouts an anchored child widget just above the
   // baseline, so we need to move the |instant_view_| down to make sure it
   // has the same baseline as the |text_view_|.
   PangoLayout* layout = gtk_label_get_layout(GTK_LABEL(instant_view_));
   int height;
   pango_layout_get_size(layout, NULL, &height);
   int baseline = pango_layout_get_baseline(layout);
   g_object_set(instant_anchor_tag_, "rise", baseline - height, NULL);
 }