| Index: chrome/browser/cocoa/browser_window_cocoa.mm
|
| diff --git a/chrome/browser/cocoa/browser_window_cocoa.mm b/chrome/browser/cocoa/browser_window_cocoa.mm
|
| index dc7566b2bd3628097b48d45b61700b0bef62c7c0..3849510cf637a6ad88b0ce5f02e2218882808e52 100644
|
| --- a/chrome/browser/cocoa/browser_window_cocoa.mm
|
| +++ b/chrome/browser/cocoa/browser_window_cocoa.mm
|
| @@ -197,7 +197,7 @@ void BrowserWindowCocoa::ConfirmAddSearchProvider(
|
| }
|
|
|
| LocationBar* BrowserWindowCocoa::GetLocationBar() const {
|
| - return [controller_ locationBar];
|
| + return [controller_ locationBarBridge];
|
| }
|
|
|
| void BrowserWindowCocoa::SetFocusToLocationBar() {
|
| @@ -223,8 +223,8 @@ bool BrowserWindowCocoa::IsBookmarkBarVisible() const {
|
| }
|
|
|
| bool BrowserWindowCocoa::IsToolbarVisible() const {
|
| - NOTIMPLEMENTED();
|
| - return true;
|
| + return browser_->SupportsWindowFeature(Browser::FEATURE_TOOLBAR) ||
|
| + browser_->SupportsWindowFeature(Browser::FEATURE_LOCATIONBAR);
|
| }
|
|
|
| // This is called from Browser, which in turn is called directly from
|
|
|