chrome/browser/ui/browser.h - Issue 836933005: Refactor fullscreen_controller.

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 build break 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:

Index: chrome/browser/ui/browser.h

diff --git a/chrome/browser/ui/browser.h b/chrome/browser/ui/browser.h

index c9aad25cf317c9be75961da0f602e7838daedc2d..b23f0b82f7928d059ed8c213bbe7fd2ccdb763dd 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* GetExclusiveAccessManager() const {

miu 2015/01/16 22:17:38 style: Inlined accessor should be named exclusive_

Sriram 2015/01/21 01:38:56 Done.

+ return exclusive_access_manager_.get();

}

extensions::WindowController* extension_window_controller() const {

@@ -953,7 +953,7 @@ class Browser : public TabStripModelObserver,

BookmarkBar::State bookmark_bar_state_;

- scoped_ptr<FullscreenController> fullscreen_controller_;

+ scoped_ptr<ExclusiveAccessManager> exclusive_access_manager_;

miu 2015/01/16 22:17:38 nit: Let's get rid of the extra indirection and he

Sriram 2015/01/21 01:38:56 Browser object construction is complex with some m

scoped_ptr<extensions::WindowController> extension_window_controller_;