Moving common code into OmniboxView from OmniboxView*

chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm

 // 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.
 
 #import "chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h"
 
 #include "base/bind.h"
 #include "base/message_loop.h"
 #include "base/stl_util.h"
 #include "base/string_util.h"
@@ skipping 163 matching lines @@
                                 browser:browser_
                                 profile:profile_];
 }
 
 string16 LocationBarViewMac::GetInputString() const {
   return location_input_;
 }
 
 void LocationBarViewMac::SetSuggestedText(const string16& text,
                                           InstantCompleteBehavior behavior) {
-  omnibox_view_->model()->SetSuggestedText(text, behavior);
+  omnibox_view_->GetModel()->SetSuggestedText(text, behavior);
 }
 
 WindowOpenDisposition LocationBarViewMac::GetWindowOpenDisposition() const {
   return disposition_;
 }
 
 content::PageTransition LocationBarViewMac::GetPageTransition() const {
   return transition_;
 }
 
 void LocationBarViewMac::AcceptInput() {
   WindowOpenDisposition disposition =
       event_utils::WindowOpenDispositionFromNSEvent([NSApp currentEvent]);
-  omnibox_view_->model()->AcceptInput(disposition, false);
+  omnibox_view_->GetModel()->AcceptInput(disposition, false);
 }
 
 void LocationBarViewMac::FocusLocation(bool select_all) {
   omnibox_view_->FocusLocation(select_all);
 }
 
 void LocationBarViewMac::FocusSearch() {
   omnibox_view_->SetForcedQuery();
 }
 
@@ skipping 455 matching lines @@
 
   [cell addRightDecoration:keyword_hint_decoration_.get()];
 
   // By default only the location icon is visible.
   location_icon_decoration_->SetVisible(true);
   selected_keyword_decoration_->SetVisible(false);
   ev_bubble_decoration_->SetVisible(false);
   keyword_hint_decoration_->SetVisible(false);
 
   // Get the keyword to use for keyword-search and hinting.
-  const string16 keyword = omnibox_view_->model()->keyword();
+  const string16 keyword = omnibox_view_->GetModel()->keyword();
   string16 short_name;
   bool is_extension_keyword = false;
   if (!keyword.empty()) {
     short_name = TemplateURLServiceFactory::GetForProfile(profile_)->
         GetKeywordShortName(keyword, &is_extension_keyword);
   }
 
-  const bool is_keyword_hint = omnibox_view_->model()->is_keyword_hint();
+  const bool is_keyword_hint = omnibox_view_->GetModel()->is_keyword_hint();
 
   if (!keyword.empty() && !is_keyword_hint) {
     // Switch from location icon to keyword mode.
     location_icon_decoration_->SetVisible(false);
     selected_keyword_decoration_->SetVisible(true);
     selected_keyword_decoration_->SetKeyword(short_name, is_extension_keyword);
     selected_keyword_decoration_->SetImage(GetKeywordImage(keyword));
   } else if (toolbar_model_->GetSecurityLevel() == ToolbarModel::EV_SECURE) {
     // Switch from location icon to show the EV bubble instead.
     location_icon_decoration_->SetVisible(false);
@@ skipping 35 matching lines @@
 void LocationBarViewMac::UpdateChromeToMobileEnabled() {
   if (!chrome_to_mobile_decoration_.get())
     return;
 
   DCHECK(ChromeToMobileService::IsChromeToMobileEnabled());
   bool enabled = [field_ isEditable] && !toolbar_model_->input_in_progress() &&
       ChromeToMobileServiceFactory::GetForProfile(profile_)->HasDevices();
   chrome_to_mobile_decoration_->SetVisible(enabled);
   command_updater_->UpdateCommandEnabled(IDC_CHROME_TO_MOBILE_PAGE, enabled);
 }