| Index: chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm
|
| diff --git a/chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm b/chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm
|
| index ce77e5c4e63a00b0a4c1140f94ef3ee82dfb4299..728ad41dbcedfa8313db2090b328810da8754d6d 100644
|
| --- a/chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm
|
| +++ b/chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm
|
| @@ -181,7 +181,7 @@ string16 LocationBarViewMac::GetInputString() const {
|
|
|
| void LocationBarViewMac::SetSuggestedText(const string16& text,
|
| InstantCompleteBehavior behavior) {
|
| - omnibox_view_->model()->SetSuggestedText(text, behavior);
|
| + omnibox_view_->GetModel()->SetSuggestedText(text, behavior);
|
| }
|
|
|
| WindowOpenDisposition LocationBarViewMac::GetWindowOpenDisposition() const {
|
| @@ -195,7 +195,7 @@ content::PageTransition LocationBarViewMac::GetPageTransition() const {
|
| 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) {
|
| @@ -671,7 +671,7 @@ void LocationBarViewMac::Layout() {
|
| 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()) {
|
| @@ -679,7 +679,7 @@ void LocationBarViewMac::Layout() {
|
| 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.
|
|
|