Moving common code into OmniboxView from OmniboxView*

chrome/browser/ui/views/location_bar/location_bar_view.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/location_bar/location_bar_view.h"
 
 #include <algorithm>
 #include <map>
 
 #include "base/stl_util.h"
@@ skipping 521 matching lines @@
     origin.set_x(width() - origin.x());
   views::View::ConvertPointToScreen(this, &origin);
   return origin;
 }
 
 void LocationBarView::SetInstantSuggestion(const string16& text,
                                            bool animate_to_complete) {
   // Don't show the suggested text if inline autocomplete is prevented.
   if (!text.empty()) {
     if (!suggested_text_view_) {
-      suggested_text_view_ = new SuggestedTextView(location_entry_->model());
+      suggested_text_view_ = new SuggestedTextView(location_entry_->GetModel());
       suggested_text_view_->SetText(text);
       suggested_text_view_->SetFont(location_entry_->GetFont());
       AddChildView(suggested_text_view_);
     } else if (suggested_text_view_->text() != text) {
       suggested_text_view_->SetText(text);
     }
     if (animate_to_complete && !location_entry_->IsImeComposing())
       suggested_text_view_->StartAnimation();
   } else if (suggested_text_view_) {
     delete suggested_text_view_;
@@ skipping 76 matching lines @@
   // Start by reserving the padding at the right edge.
   int entry_width = width() - kEdgeThickness - GetEdgeItemPadding();
 
   // |location_icon_view_| is visible except when |ev_bubble_view_| or
   // |selected_keyword_view_| are visible.
   int location_icon_width = 0;
   int ev_bubble_width = 0;
   location_icon_view_->SetVisible(false);
   ev_bubble_view_->SetVisible(false);
 
-  const string16 keyword(location_entry_->model()->keyword());
-  const bool is_keyword_hint(location_entry_->model()->is_keyword_hint());
+  const string16 keyword(location_entry_->GetModel()->keyword());
+  const bool is_keyword_hint(location_entry_->GetModel()->is_keyword_hint());
   const bool show_selected_keyword = !keyword.empty() && !is_keyword_hint;
   if (show_selected_keyword) {
     // Assume the keyword might be hidden.
     entry_width -= (kEdgeThickness + kEdgeEditPadding);
   } else if (model_->GetSecurityLevel() == ToolbarModel::EV_SECURE) {
     ev_bubble_view_->SetVisible(true);
     ev_bubble_view_->SetLabel(model_->GetEVCertName());
     ev_bubble_width = ev_bubble_view_->GetPreferredSize().width();
     // We'll adjust this width and take it out of |entry_width| below.
   } else {
@@ skipping 561 matching lines @@
 }
 
 std::string LocationBarView::GetClassName() const {
   return kViewClassName;
 }
 
 bool LocationBarView::SkipDefaultKeyEventProcessing(
     const views::KeyEvent& event) {
 #if defined(OS_WIN)
   if (views::FocusManager::IsTabTraversalKeyEvent(event)) {
-    if (location_entry_->model()->popup_model()->IsOpen()) {
+    if (location_entry_->GetModel()->popup_model()->IsOpen()) {
       // Return true so that the edit sees the tab and moves the selection.
       return true;
     }
     if (keyword_hint_view_->visible() && !event.IsShiftDown()) {
       // Return true so the edit gets the tab event and enters keyword mode.
       return true;
     }
 
     // Tab while showing instant commits instant immediately.
     // Return true so that focus traversal isn't attempted. The edit ends
     // up doing nothing in this case.
-    if (location_entry_->model()->AcceptCurrentInstantPreview())
+    if (location_entry_->GetModel()->AcceptCurrentInstantPreview())
       return true;
   }
 
 #if defined(USE_AURA)
   NOTIMPLEMENTED();
   return false;
 #else
   OmniboxViewWin* omnibox_win = GetOmniboxViewWin(location_entry_.get());
   if (omnibox_win)
     return omnibox_win->SkipDefaultKeyEventProcessing(event);
@@ skipping 11 matching lines @@
   state->value = location_entry_->GetText();
 
   string16::size_type entry_start;
   string16::size_type entry_end;
   location_entry_->GetSelectionBounds(&entry_start, &entry_end);
   state->selection_start = entry_start;
   state->selection_end = entry_end;
 }
 
 bool LocationBarView::HasFocus() const {
-  return location_entry_->model()->has_focus();
+  return location_entry_->GetModel()->has_focus();
 }
 
 void LocationBarView::WriteDragDataForView(views::View* sender,
                                            const gfx::Point& press_pt,
                                            OSExchangeData* data) {
   DCHECK_NE(GetDragOperationsForView(sender, press_pt),
             ui::DragDropTypes::DRAG_NONE);
 
   TabContents* tab_contents = delegate_->GetTabContents();
   DCHECK(tab_contents);
@@ skipping 32 matching lines @@
     template_url_service_ = url_service;
     template_url_service_->AddObserver(this);
     template_url_service_->Load();
     return;
   }
   ShowFirstRunBubbleInternal();
 }
 
 void LocationBarView::SetSuggestedText(const string16& text,
                                        InstantCompleteBehavior behavior) {
-  location_entry_->model()->SetSuggestedText(text, behavior);
+  location_entry_->GetModel()->SetSuggestedText(text, behavior);
 }
 
 string16 LocationBarView::GetInputString() const {
   return location_input_;
 }
 
 WindowOpenDisposition LocationBarView::GetWindowOpenDisposition() const {
   return disposition_;
 }
 
 content::PageTransition LocationBarView::GetPageTransition() const {
   return transition_;
 }
 
 void LocationBarView::AcceptInput() {
-  location_entry_->model()->AcceptInput(CURRENT_TAB, false);
+  location_entry_->GetModel()->AcceptInput(CURRENT_TAB, false);
 }
 
 void LocationBarView::FocusLocation(bool select_all) {
   location_entry_->SetFocus();
   if (select_all)
     location_entry_->SelectAll(true);
 }
 
 void LocationBarView::FocusSearch() {
   location_entry_->SetFocus();
@@ skipping 149 matching lines @@
 }
 
 void LocationBarView::CleanupFadeAnimation() {
   // Since we're no longer animating we don't need our layer.
   SetPaintToLayer(false);
   // Bubble labels don't need a transparent background anymore.
   ev_bubble_view_->SetLabelBackgroundColor(SK_ColorWHITE);
   selected_keyword_view_->SetLabelBackgroundColor(SK_ColorWHITE);
 }
 #endif  // USE_AURA