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

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

Issue 2824803004: Implement BrowserWindowCocoa::IsToolbarShowing (Closed)
Patch Set: Created 3 years, 8 months 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/ui/cocoa/browser_window_cocoa.h ('k') | chrome/browser/ui/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/ui/cocoa/browser_window_cocoa.mm
diff --git a/chrome/browser/ui/cocoa/browser_window_cocoa.mm b/chrome/browser/ui/cocoa/browser_window_cocoa.mm
index 7e1c93c050168d7647b97a64cfe6dd1846aebfba..2c02b13e2dd3072b5f738b77ee5fb3b4886ff7fb 100644
--- a/chrome/browser/ui/cocoa/browser_window_cocoa.mm
+++ b/chrome/browser/ui/cocoa/browser_window_cocoa.mm
@@ -326,10 +326,7 @@ bool BrowserWindowCocoa::IsToolbarShowing() const {
if (!IsFullscreen())
return true;
- // TODO(zijiehe): Retrieve the visibility of toolbar from
- // FullscreenToolbarController. See http://crbug.com/702251 and
- // http://crbug.com/680809.
- return true;
+ return [cocoa_controller() isToolbarShowing] == YES;
}
void BrowserWindowCocoa::BookmarkBarStateChanged(
@@ -727,13 +724,14 @@ BrowserWindowCocoa::PreHandleKeyboardEvent(
return content::KeyboardEventProcessingResult::NOT_HANDLED;
if (browser_->command_controller()->IsReservedCommandOrKey(id, event)) {
+ using Result = content::KeyboardEventProcessingResult;
return [BrowserWindowUtils handleKeyboardEvent:event.os_event
inWindow:window()]
- ? content::KeyboardEventProcessingResult::HANDLED
- : content::KeyboardEventProcessingResult::NOT_HANDLED;
+ ? Result::HANDLED
+ : Result::NOT_HANDLED_IS_SHORTCUT;
}
- return content::KeyboardEventProcessingResult::NOT_HANDLED_IS_SHORTCUT;
+ return content::KeyboardEventProcessingResult::NOT_HANDLED;
}
void BrowserWindowCocoa::HandleKeyboardEvent(
« no previous file with comments | « chrome/browser/ui/cocoa/browser_window_cocoa.h ('k') | chrome/browser/ui/cocoa/browser_window_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698