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

Unified Diff: chrome/browser/ui/browser.h

Issue 836933005: Refactor fullscreen_controller. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix mac build break after rebase to TOT Created 5 years, 11 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
Index: chrome/browser/ui/browser.h
diff --git a/chrome/browser/ui/browser.h b/chrome/browser/ui/browser.h
index e7aff35c7a674cc6db4e76461e9049198a3bc6bc..b4b303356f73d263b53e937a11c2e2d727e5a1c2 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_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,8 @@ class Browser : public TabStripModelObserver,
// Show a download on the download shelf.
void ShowDownload(content::DownloadItem* download);
- FullscreenController* fullscreen_controller() const {
- return fullscreen_controller_.get();
+ ExclusiveAccessManager* exclusive_access_manager() {
+ return exclusive_access_manager_.get();
}
extensions::WindowController* extension_window_controller() const {
@@ -954,7 +954,7 @@ class Browser : public TabStripModelObserver,
BookmarkBar::State bookmark_bar_state_;
- scoped_ptr<FullscreenController> fullscreen_controller_;
+ scoped_ptr<ExclusiveAccessManager> exclusive_access_manager_;
scoped_ptr<extensions::WindowController> extension_window_controller_;

Powered by Google App Engine
This is Rietveld 408576698