Moving common code into OmniboxView from OmniboxView*

chrome/browser/ui/views/omnibox/omnibox_view_win.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/views/omnibox/omnibox_view_win.h"
 
 #include <algorithm>
 #include <locale>
 #include <string>
 
@@ skipping 421 matching lines @@
 
 }  // namespace
 
 OmniboxViewWin::OmniboxViewWin(OmniboxEditController* controller,
                                ToolbarModel* toolbar_model,
                                LocationBarView* parent_view,
                                CommandUpdater* command_updater,
                                bool popup_window_mode,
                                views::View* location_bar,
                                views::View* popup_parent_view)
-    : model_(new OmniboxEditModel(this, controller, parent_view->profile())),
+    : OmniboxView(parent_view->profile(), controller, toolbar_model,
+          command_updater),
       popup_view_(OmniboxPopupContentsView::Create(
           parent_view->font(), this, model_.get(), location_bar,
           popup_parent_view)),
-      controller_(controller),
       parent_view_(parent_view),
-      toolbar_model_(toolbar_model),
-      command_updater_(command_updater),
       popup_window_mode_(popup_window_mode),
       force_hidden_(false),
       tracking_click_(),
       tracking_double_click_(false),
       double_click_time_(0),
       can_discard_mousemove_(false),
       ignore_ime_messages_(false),
       delete_at_end_pressed_(false),
       font_(parent_view->font()),
       possible_drag_(false),
@@ skipping 161 matching lines @@
   } else if (changed_security_level) {
     // Only the security style changed, nothing else.  Redraw our text using it.
     EmphasizeURLComponents();
   }
 }
 
 void OmniboxViewWin::OpenMatch(const AutocompleteMatch& match,
                                WindowOpenDisposition disposition,
                                const GURL& alternate_nav_url,
                                size_t selected_line) {
-  if (!match.destination_url.is_valid())
-    return;
-
   // When we navigate, we first revert to the unedited state, then if necessary
   // synchronously change the permanent text to the new URL.  If we don't freeze
   // here, the user could potentially see a flicker of the current URL before
   // the new one reappears, which would look glitchy.
   ScopedFreeze freeze(this, GetTextObjectModel());
-  model_->OpenMatch(match, disposition, alternate_nav_url, selected_line);
+  OmniboxView::OpenMatch(match, disposition, alternate_nav_url, selected_line);
 }
 
 string16 OmniboxViewWin::GetText() const {
   const int len = GetTextLength() + 1;
   string16 str;
   if (len > 1)
     GetWindowText(WriteInto(&str, len), len);
   return str;
 }
 
-bool OmniboxViewWin::IsEditingOrEmpty() const {
-  return model_->user_input_in_progress() || (GetTextLength() == 0);
-}
-
-int OmniboxViewWin::GetIcon() const {
-  return IsEditingOrEmpty() ?
-      AutocompleteMatch::TypeToIcon(model_->CurrentTextType()) :
-      toolbar_model_->GetIcon();
-}
-
-void OmniboxViewWin::SetUserText(const string16& text) {
-  SetUserText(text, text, true);
-}
-
 void OmniboxViewWin::SetUserText(const string16& text,
                                  const string16& display_text,
                                  bool update_popup) {
   ScopedFreeze freeze(this, GetTextObjectModel());
-  model_->SetUserText(text);
   saved_selection_for_focus_change_.cpMin = -1;
-  SetWindowTextAndCaretPos(display_text, display_text.length(), update_popup,
-      true);
+  OmniboxView::SetUserText(text, display_text, update_popup);
 }
 
 void OmniboxViewWin::SetWindowTextAndCaretPos(const string16& text,
                                               size_t caret_pos,
                                               bool update_popup,
                                               bool notify_text_changed) {
   SetWindowText(text.c_str());
   PlaceCaretAt(caret_pos);
 
   if (update_popup)
     UpdatePopup();
 
   if (notify_text_changed)
     TextChanged();
 }
 
 void OmniboxViewWin::SetForcedQuery() {
   const string16 current_text(GetText());
   const size_t start = current_text.find_first_not_of(kWhitespaceWide);
   if (start == string16::npos || (current_text[start] != '?'))
-    SetUserText(L"?");
+    OmniboxView::SetUserText(L"?");

[Peter Kasting, 2012/07/26 03:59:17]

Why is this a direct superclass call?  That changes the functionality.

[dominich, 2012/07/26 22:33:24]

There is no version in the derived class that takes a single parameter. Instead,
we call the base class version which then dispatches to the virtual call with
multiple parameters.

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

Oh, and scope resolution requires that we qualify this for it to compile?  Ugh.

   else
     SetSelection(current_text.length(), start + 1);
 }
 
 bool OmniboxViewWin::IsSelectAll() const {
   CHARRANGE selection;
   GetSel(selection);
   return IsSelectAllForRange(selection);
 }
 
@@ skipping 11 matching lines @@
 
 void OmniboxViewWin::SelectAll(bool reversed) {
   if (reversed)
     SetSelection(GetTextLength(), 0);
   else
     SetSelection(0, GetTextLength());
 }
 
 void OmniboxViewWin::RevertAll() {
   ScopedFreeze freeze(this, GetTextObjectModel());
-  ClosePopup();
   saved_selection_for_focus_change_.cpMin = -1;
-  model_->Revert();
+  OmniboxView::RevertAll();
 }
 
 void OmniboxViewWin::UpdatePopup() {
   ScopedFreeze freeze(this, GetTextObjectModel());
   model_->SetInputInProgress(true);
 
   // Don't allow the popup to open while the candidate window is open, so
   // they don't overlap.
   if (ime_candidate_window_open_)
     return;
@@ skipping 14 matching lines @@
   //   * The user is deleting text
   //   * The caret/selection isn't at the end of the text
   //   * The user has just pasted in something that replaced all the text
   //   * The user is trying to compose something in an IME
   CHARRANGE sel;
   GetSel(sel);
   model_->StartAutocomplete(sel.cpMax != sel.cpMin,
                             (sel.cpMax < GetTextLength()) || IsImeComposing());
 }
 
-void OmniboxViewWin::ClosePopup() {
-  model_->StopAutocomplete();
-}
-
 void OmniboxViewWin::SetFocus() {
   ::SetFocus(m_hWnd);
 }
 
 void OmniboxViewWin::SetDropHighlightPosition(int position) {
   if (drop_highlight_position_ != position) {
     RepaintDropHighlight(drop_highlight_position_);
     drop_highlight_position_ = position;
     RepaintDropHighlight(drop_highlight_position_);
   }
@@ skipping 159 matching lines @@
   // TODO(hbono): http://b/1111369 if we exclude this popup window from the
   // display area of IME windows, this workaround becomes unnecessary.
   HWND ime_window = ImmGetDefaultIMEWnd(edit_native_view);
   return ime_window ? ime_window : HWND_NOTOPMOST;
 }
 
 gfx::NativeView OmniboxViewWin::GetRelativeWindowForPopup() const {
   return GetRelativeWindowForNativeView(GetNativeView());
 }
 
-CommandUpdater* OmniboxViewWin::GetCommandUpdater() {
-  return command_updater_;
-}
-
 void OmniboxViewWin::SetInstantSuggestion(const string16& suggestion,
                                           bool animate_to_complete) {
   parent_view_->SetInstantSuggestion(suggestion, animate_to_complete);
 }
 
 int OmniboxViewWin::TextWidth() const {
   return WidthNeededToDisplay(GetText());
 }
 
 string16 OmniboxViewWin::GetInstantSuggestion() const {
@@ skipping 45 matching lines @@
 
 int OmniboxViewWin::OnPerformDropImpl(const views::DropTargetEvent& event,
                                       bool in_drag) {
   const ui::OSExchangeData& data = event.data();
 
   if (data.HasURL()) {
     GURL url;
     string16 title;
     if (data.GetURLAndTitle(&url, &title)) {
       string16 text(StripJavascriptSchemas(UTF8ToUTF16(url.spec())));
-      SetUserText(text);
-      model()->AcceptInput(CURRENT_TAB, true);
+      OmniboxView::SetUserText(text);

[Peter Kasting, 2012/07/26 03:59:17]

Another case where I'm not sure why this is a superclass call.

[dominich, 2012/07/26 22:33:24]

see above. There shouldn't be a functional change here.

+      GetModel()->AcceptInput(CURRENT_TAB, true);
       return CopyOrLinkDragOperation(event.source_operations());
     }
   } else if (data.HasString()) {
     int string_drop_position = drop_highlight_position();
     string16 text;
     if ((string_drop_position != -1 || !in_drag) && data.GetString(&text)) {
       DCHECK(string_drop_position == -1 ||
              ((string_drop_position >= 0) &&
               (string_drop_position <= GetTextLength())));
       if (in_drag) {
@@ skipping 1229 matching lines @@
   // the end of the text, but triple-click will still work.
   if (x < left_bound) {
     return (is_triple_click && ltr_text_in_ltr_layout) ? left_bound - 1 :
                                                          left_bound;
   }
   if ((length == 0) || (x < right_bound))
     return x;
   return is_triple_click ? (right_bound - 1) : right_bound;
 }
 
+int OmniboxViewWin::GetOmniboxTextLength() const {
+  return static_cast<int>(GetTextLength());
+}
+
 void OmniboxViewWin::EmphasizeURLComponents() {
   ITextDocument* const text_object_model = GetTextObjectModel();
   ScopedFreeze freeze(this, text_object_model);
   ScopedSuspendUndo suspend_undo(text_object_model);
 
   // Save the selection.
   CHARRANGE saved_sel;
   GetSelection(saved_sel);
 
   // See whether the contents are a URL with a non-empty host portion, which we
@@ skipping 176 matching lines @@
     return;
 
   HGDIOBJ last_pen = SelectObject(hdc, CreatePen(PS_SOLID, 1, RGB(0, 0, 0)));
   MoveToEx(hdc, clip_rect.left, clip_rect.top, NULL);
   LineTo(hdc, clip_rect.left, clip_rect.bottom);
   DeleteObject(SelectObject(hdc, last_pen));
 }
 
 void OmniboxViewWin::TextChanged() {
   ScopedFreeze freeze(this, GetTextObjectModel());
-  EmphasizeURLComponents();
-  model_->OnChanged();
+  OmniboxView::TextChanged();
 }
 
 ITextDocument* OmniboxViewWin::GetTextObjectModel() const {
   if (!text_object_model_) {
     // This is lazily initialized, instead of being initialized in the
     // constructor, in order to avoid hurting startup performance.
     base::win::ScopedComPtr<IRichEditOle, NULL> ole_interface;
     ole_interface.Attach(GetOleInterface());
     if (ole_interface) {
       ole_interface.QueryInterface(
@@ skipping 30 matching lines @@
   }
 
   const string16 start_text(GetText());
   string16 text_to_write(GetSelectedText());
   GURL url;
   bool write_url;
   const bool is_all_selected = IsSelectAllForRange(sel);
 
   // |sel| was set by GetSelection(), which preserves selection direction, so
   // sel.cpMin may not be the smaller value.
-  model()->AdjustTextForCopy(std::min(sel.cpMin, sel.cpMax), is_all_selected,
-                             &text_to_write, &url, &write_url);
+  GetModel()->AdjustTextForCopy(std::min(sel.cpMin, sel.cpMax), is_all_selected,
+                                &text_to_write, &url, &write_url);
 
   if (write_url) {
     string16 title;
     SkBitmap favicon;
     if (is_all_selected)
       model_->GetDataForURLExport(&url, &title, &favicon);
     button_drag_utils::SetURLAndDragImage(url, title, favicon, &data,
                                           native_view_host_->GetWidget());
     supported_modes |= DROPEFFECT_LINK;
     content::RecordAction(UserMetricsAction("Omnibox_DragURL"));
@@ skipping 135 matching lines @@
   return (rect.left - client_rect.left) + (client_rect.right - rect.right);
 }
 
 int OmniboxViewWin::WidthNeededToDisplay(const string16& text) const {
   // Use font_.GetStringWidth() instead of
   // PosFromChar(location_entry_->GetTextLength()) because PosFromChar() is
   // apparently buggy. In both LTR UI and RTL UI with left-to-right layout,
   // PosFromChar(i) might return 0 when i is greater than 1.
   return font_.GetStringWidth(text) + GetHorizontalMargin();
 }
-
-bool OmniboxViewWin::IsCaretAtEnd() const {
-  long length = GetTextLength();
-  CHARRANGE sel;
-  GetSelection(sel);
-  return sel.cpMin == sel.cpMax && sel.cpMin == length;
-}