Refactor: Untangle Mac's ExclusiveAccessContext from BrowserWindow

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"
 #include "base/message_loop/message_loop.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/string_util.h"
 #include "base/strings/sys_string_conversions.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/download/download_shelf.h"
 #include "chrome/browser/extensions/extension_util.h"
 #include "chrome/browser/extensions/tab_helper.h"
-#include "chrome/browser/fullscreen.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/shell_integration.h"
 #include "chrome/browser/signin/chrome_signin_helper.h"
 #include "chrome/browser/translate/chrome_translate_client.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_command_controller.h"
 #include "chrome/browser/ui/browser_commands_mac.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/browser_window_state.h"
 #import "chrome/browser/ui/cocoa/autofill/save_card_bubble_view_bridge.h"
@@ skipping 10 matching lines @@
 #import "chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h"
 #import "chrome/browser/ui/cocoa/nsmenuitem_additions.h"
 #import "chrome/browser/ui/cocoa/profiles/avatar_base_controller.h"
 #import "chrome/browser/ui/cocoa/profiles/avatar_menu_bubble_controller.h"
 #include "chrome/browser/ui/cocoa/restart_browser.h"
 #include "chrome/browser/ui/cocoa/status_bubble_mac.h"
 #include "chrome/browser/ui/cocoa/task_manager_mac.h"
 #import "chrome/browser/ui/cocoa/toolbar/toolbar_controller.h"
 #import "chrome/browser/ui/cocoa/web_dialog_window_controller.h"
 #import "chrome/browser/ui/cocoa/website_settings/website_settings_bubble_controller.h"
-#include "chrome/browser/ui/exclusive_access/fullscreen_controller.h"
 #include "chrome/browser/ui/search/search_model.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/browser/web_applications/web_app.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/grit/generated_resources.h"
 #include "components/bookmarks/common/bookmark_pref_names.h"
 #include "components/translate/core/browser/language_state.h"
 #include "content/public/browser/native_web_keyboard_event.h"
 #include "content/public/browser/notification_details.h"
@@ skipping 139 matching lines @@
   [window() orderFront:controller_];
 }
 
 void BrowserWindowCocoa::Hide() {
   [window() orderOut:controller_];
 }
 
 void BrowserWindowCocoa::SetBounds(const gfx::Rect& bounds) {
   gfx::Rect real_bounds = [controller_ enforceMinWindowSize:bounds];
 
-  ExitFullscreen();
+  [controller_ exitAnyFullscreen];

[spqchan, 2016/02/01 19:55:04]

It's probably safer to just use [controller_
exclusiveAccessContext]->ExitFullscreen(), in case the implementation ends up
changing.

[tapted, 2016/02/02 11:57:06]

Yah, good idea. Done.

[tapted, 2016/02/02 21:58:43]

(note with this change I also needed to move the initialization of the
ExclusiveAccessController to before the initial SetBounds call in the
BrowserWindowController initializer, so that's now in patchset 6)

   NSRect cocoa_bounds = NSMakeRect(real_bounds.x(), 0,
                                    real_bounds.width(),
                                    real_bounds.height());
   // Flip coordinates based on the primary screen.
   NSScreen* screen = [[NSScreen screens] firstObject];
   cocoa_bounds.origin.y =
       NSHeight([screen frame]) - real_bounds.height() - real_bounds.y();
 
   [window() setFrame:cocoa_bounds display:YES];
 }
@@ skipping 181 matching lines @@
   [window() miniaturize:controller_];
 }
 
 void BrowserWindowCocoa::Restore() {
   if (IsMaximized())
     [window() zoom:controller_];  // Toggles zoom mode.
   else if (IsMinimized())
     [window() deminiaturize:controller_];
 }
 
-// See browser_window_controller.h for a detailed explanation of the logic in
-// this method.
-void BrowserWindowCocoa::EnterFullscreen(const GURL& url,
-                                         ExclusiveAccessBubbleType bubble_type,
-                                         bool with_toolbar) {
-  if (browser_->exclusive_access_manager()
-          ->fullscreen_controller()
-          ->IsWindowFullscreenForTabOrPending())
-    [controller_ enterWebContentFullscreenForURL:url bubbleType:bubble_type];
-  else if (!url.is_empty())
-    [controller_ enterExtensionFullscreenForURL:url bubbleType:bubble_type];
-  else
-    [controller_ enterBrowserFullscreenWithToolbar:with_toolbar];
-}
-
-void BrowserWindowCocoa::ExitFullscreen() {
-  [controller_ exitAnyFullscreen];
-}
-
-void BrowserWindowCocoa::UpdateExclusiveAccessExitBubbleContent(
-    const GURL& url,
-    ExclusiveAccessBubbleType bubble_type) {
-  [controller_ updateFullscreenExitBubbleURL:url bubbleType:bubble_type];
-}
-
-void BrowserWindowCocoa::OnExclusiveAccessUserInput() {
-  // TODO(mgiuca): Route this signal to the exclusive access bubble on Mac.
-}
-
 bool BrowserWindowCocoa::ShouldHideUIForFullscreen() const {
   // On Mac, fullscreen mode has most normal things (in a slide-down panel).
   return false;
 }
 
 bool BrowserWindowCocoa::IsFullscreen() const {
   return [controller_ isInAnyFullscreenMode];
 }
 
 bool BrowserWindowCocoa::IsFullscreenBubbleVisible() const {
-  return false;
-}
-
-bool BrowserWindowCocoa::SupportsFullscreenWithToolbar() const {
-  return chrome::mac::SupportsSystemFullscreen();
-}
-
-void BrowserWindowCocoa::UpdateFullscreenWithToolbar(bool with_toolbar) {
-  [controller_ updateFullscreenWithToolbar:with_toolbar];
-}
-
-void BrowserWindowCocoa::ToggleFullscreenToolbar() {
-  [controller_ toggleFullscreenToolbar];
-}
-
-bool BrowserWindowCocoa::IsFullscreenWithToolbar() const {
-  return IsFullscreen() && ![controller_ inPresentationMode];
-}
-
-bool BrowserWindowCocoa::ShouldHideFullscreenToolbar() const {
-  return [controller_ shouldHideFullscreenToolbar];
+  return false;  // Currently only called from toolkit-views website_settings.
 }
 
 void BrowserWindowCocoa::ConfirmAddSearchProvider(
     TemplateURL* template_url,
     Profile* profile) {
   // The controller will release itself when the window closes.
   EditSearchEngineCocoaController* editor =
       [[EditSearchEngineCocoaController alloc] initWithProfile:profile
                                                       delegate:NULL
                                                    templateURL:template_url];
@@ skipping 390 matching lines @@
   return 40;
 }
 
 void BrowserWindowCocoa::ExecuteExtensionCommand(
     const extensions::Extension* extension,
     const extensions::Command& command) {
   [cocoa_controller() executeExtensionCommand:extension->id() command:command];
 }
 
 ExclusiveAccessContext* BrowserWindowCocoa::GetExclusiveAccessContext() {
-  return this;
+  return [controller_ exclusiveAccessContext];
 }
-
-Profile* BrowserWindowCocoa::GetProfile() {
-  return browser_->profile();
-}
-
-WebContents* BrowserWindowCocoa::GetActiveWebContents() {
-  return browser_->tab_strip_model()->GetActiveWebContents();
-}
-
-void BrowserWindowCocoa::UnhideDownloadShelf() {
-  GetDownloadShelf()->Unhide();
-}
-
-void BrowserWindowCocoa::HideDownloadShelf() {
-  GetDownloadShelf()->Hide();
-  StatusBubble* statusBubble = GetStatusBubble();
-  if (statusBubble)
-    statusBubble->Hide();
-}