Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1382)

Unified Diff: chrome/browser/cocoa/browser_window_cocoa.mm

Issue 495010: Mac: fix/implement app windows (not app mode), popups, drawing; refactor code. (Closed)
Patch Set: Updated per pink's review. Created 11 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/cocoa/bookmark_bar_controller.mm ('k') | chrome/browser/cocoa/browser_window_controller.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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
« no previous file with comments | « chrome/browser/cocoa/bookmark_bar_controller.mm ('k') | chrome/browser/cocoa/browser_window_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698