| Index: chrome/browser/ui/browser.h
|
| diff --git a/chrome/browser/ui/browser.h b/chrome/browser/ui/browser.h
|
| index c9aad25cf317c9be75961da0f602e7838daedc2d..08c6202a0c8447a79657d5056c685761b5d7b9a1 100644
|
| --- a/chrome/browser/ui/browser.h
|
| +++ b/chrome/browser/ui/browser.h
|
| @@ -24,6 +24,7 @@
|
| #include "chrome/browser/ui/bookmarks/bookmark_tab_helper_delegate.h"
|
| #include "chrome/browser/ui/browser_navigator.h"
|
| #include "chrome/browser/ui/chrome_web_modal_dialog_manager_delegate.h"
|
| +#include "chrome/browser/ui/exclusive_access/exclusive_access_controller_manager.h"
|
| #include "chrome/browser/ui/host_desktop.h"
|
| #include "chrome/browser/ui/search/search_tab_helper_delegate.h"
|
| #include "chrome/browser/ui/search_engines/search_engine_tab_helper_delegate.h"
|
| @@ -57,7 +58,6 @@ class BrowserToolbarModelDelegate;
|
| class BrowserTabRestoreServiceDelegate;
|
| class BrowserWindow;
|
| class FindBarController;
|
| -class FullscreenController;
|
| class PrefService;
|
| class Profile;
|
| class SearchDelegate;
|
| @@ -475,8 +475,9 @@ class Browser : public TabStripModelObserver,
|
| // Show a download on the download shelf.
|
| void ShowDownload(content::DownloadItem* download);
|
|
|
| - FullscreenController* fullscreen_controller() const {
|
| - return fullscreen_controller_.get();
|
| + ExclusiveAccessControllerManager* GetExclusiveAccessControllerManager()
|
| + const {
|
| + return exclusive_access_controller_manager_.get();
|
| }
|
|
|
| extensions::WindowController* extension_window_controller() const {
|
| @@ -953,7 +954,8 @@ class Browser : public TabStripModelObserver,
|
|
|
| BookmarkBar::State bookmark_bar_state_;
|
|
|
| - scoped_ptr<FullscreenController> fullscreen_controller_;
|
| + scoped_ptr<ExclusiveAccessControllerManager>
|
| + exclusive_access_controller_manager_;
|
|
|
| scoped_ptr<extensions::WindowController> extension_window_controller_;
|
|
|
|
|