Moving common code into OmniboxView from OmniboxView*

chrome/browser/ui/gtk/location_bar_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/location_bar_view_gtk.h"
 
 #include <algorithm>
 #include <string>
 #include <vector>
 
@@ skipping 526 matching lines @@
           // The navigation controller will delete the fetcher.
         }
       }
     }
   }
 }
 
 void LocationBarViewGtk::OnChanged() {
   UpdateSiteTypeArea();
 
-  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();
   show_selected_keyword_ = !keyword.empty() && !is_keyword_hint;
   show_keyword_hint_ = !keyword.empty() && is_keyword_hint;
 
   if (show_selected_keyword_)
     SetKeywordLabel(keyword);
 
   if (show_keyword_hint_)
     SetKeywordHintLabel(keyword);
 
   AdjustChildrenVisibility();
@@ skipping 113 matching lines @@
   // We need the browser window to be shown before we can show the bubble, but
   // we get called before that's happened.
   MessageLoop::current()->PostTask(
       FROM_HERE,
       base::Bind(&LocationBarViewGtk::ShowFirstRunBubbleInternal,
                  weak_ptr_factory_.GetWeakPtr()));
 }
 
 void LocationBarViewGtk::SetSuggestedText(const string16& text,
                                           InstantCompleteBehavior behavior) {
-  location_entry_->model()->SetSuggestedText(text, behavior);
+  location_entry_->GetModel()->SetSuggestedText(text, behavior);
 }
 
 string16 LocationBarViewGtk::GetInputString() const {
   return location_input_;
 }
 
 WindowOpenDisposition LocationBarViewGtk::GetWindowOpenDisposition() const {
   return disposition_;
 }
 
 content::PageTransition LocationBarViewGtk::GetPageTransition() const {
   return transition_;
 }
 
 void LocationBarViewGtk::AcceptInput() {
-  location_entry_->model()->AcceptInput(CURRENT_TAB, false);
+  location_entry_->GetModel()->AcceptInput(CURRENT_TAB, false);
 }
 
 void LocationBarViewGtk::FocusLocation(bool select_all) {
   location_entry_->SetFocus();
   if (select_all)
     location_entry_->SelectAll(true);
 }
 
 void LocationBarViewGtk::FocusSearch() {
   location_entry_->SetFocus();
@@ skipping 240 matching lines @@
                        0, 0, 0, 0, 0, 0);
     background.RenderToWidget(widget);
   }
 
   return FALSE;  // Continue propagating the expose.
 }
 
 void LocationBarViewGtk::UpdateSiteTypeArea() {
   // The icon is always visible except when the |tab_to_search_alignment_| is
   // visible.
-  if (!location_entry_->model()->keyword().empty() &&
-      !location_entry_->model()->is_keyword_hint()) {
+  if (!location_entry_->GetModel()->keyword().empty() &&
+      !location_entry_->GetModel()->is_keyword_hint()) {
     gtk_widget_hide(site_type_area());
     return;
   }
 
   int resource_id = location_entry_->GetIcon();
   gtk_image_set_from_pixbuf(
       GTK_IMAGE(location_icon_image_),
       theme_service_->GetImageNamed(resource_id)->ToGdkPixbuf());
 
   if (toolbar_model_->GetSecurityLevel() == ToolbarModel::EV_SECURE) {
@@ skipping 1002 matching lines @@
 }
 
 void LocationBarViewGtk::PageActionViewGtk::InspectPopup(
     ExtensionAction* action) {
   ExtensionPopupGtk::Show(
       action->GetPopupUrl(current_tab_id_),
       owner_->browser_,
       event_box_.get(),
       ExtensionPopupGtk::SHOW_AND_INSPECT);
 }