| 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 456a27e6c3071852cea1263368e4dbd66edd6fa3..e43968b30d8b7caa84362937d4c2a60c251ddd5f 100644
|
| --- a/chrome/browser/ui/cocoa/browser_window_cocoa.mm
|
| +++ b/chrome/browser/ui/cocoa/browser_window_cocoa.mm
|
| @@ -48,6 +48,7 @@
|
| #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/exclusive_access_controller_manager.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"
|
| @@ -361,7 +362,9 @@ void BrowserWindowCocoa::Restore() {
|
| void BrowserWindowCocoa::EnterFullscreen(const GURL& url,
|
| ExclusiveAccessBubbleType bubble_type,
|
| bool with_toolbar) {
|
| - if (browser_->fullscreen_controller()->IsWindowFullscreenForTabOrPending())
|
| + if (browser_->GetExclusiveAccessControllerManager()
|
| + ->fullscreen_controller()
|
| + ->IsWindowFullscreenForTabOrPending())
|
| [controller_ enterWebContentFullscreenForURL:url bubbleType:bubble_type];
|
| else if (!url.is_empty())
|
| [controller_ enterExtensionFullscreenForURL:url bubbleType:bubble_type];
|
|
|