Implement BrowserWindowCocoa::IsToolbarShowing

chrome/browser/ui/cocoa/browser_window_cocoa.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.
 
 #include "chrome/browser/ui/cocoa/browser_window_cocoa.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/logging.h"
 #import "base/mac/sdk_forward_declarations.h"
@@ skipping 308 matching lines @@
                                    base::SysNSStringToUTF16(@"🔇"));
   }
   return base::SysUTF16ToNSString(
       browser_->GetWindowTitleForCurrentTab(include_app_name));
 }
 
 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(
     BookmarkBar::AnimateChangeType change_type) {
   [[controller_ bookmarkBarController]
       updateState:browser_->bookmark_bar_state()
        changeType:change_type];
 }
 
 void BrowserWindowCocoa::UpdateDevTools() {
@@ skipping 377 matching lines @@
       [controller_
           handledByExtensionCommand:event.os_event
                            priority:ui::AcceleratorManager::kHighPriority])
     return content::KeyboardEventProcessingResult::HANDLED;
 
   int id = [BrowserWindowUtils getCommandId:event];
   if (id == -1)
     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(
     const NativeWebKeyboardEvent& event) {
   if ([BrowserWindowUtils shouldHandleKeyboardEvent:event]) {
     if (![BrowserWindowUtils handleKeyboardEvent:event.os_event
                                         inWindow:window()]) {
 
       // TODO(spqchan): This is a temporary fix for exit extension fullscreen.
       // A priority system for exiting extension fullscreen when there is a
@@ skipping 104 matching lines @@
 ExclusiveAccessContext* BrowserWindowCocoa::GetExclusiveAccessContext() {
   return [controller_ exclusiveAccessController];
 }
 
 void BrowserWindowCocoa::ShowImeWarningBubble(
     const extensions::Extension* extension,
     const base::Callback<void(ImeWarningBubblePermissionStatus status)>&
         callback) {
   NOTREACHED() << "The IME warning bubble is unsupported on this platform.";
 }