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

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

Issue 9353010: Add FullscreenController::ToggleFullscreenModeWithExtension (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix Mac build Created 8 years, 10 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/fullscreen_controller.h
diff --git a/chrome/browser/ui/fullscreen_controller.h b/chrome/browser/ui/fullscreen_controller.h
index b02bc002d4f7e971deb5f97f9df1f2e881861ebb..c16ab41151e2fc883f40661841cb846040905bd8 100644
--- a/chrome/browser/ui/fullscreen_controller.h
+++ b/chrome/browser/ui/fullscreen_controller.h
@@ -13,6 +13,7 @@
class Browser;
class BrowserWindow;
+class Extension;
class GURL;
class Profile;
class TabContents;
@@ -50,10 +51,10 @@ class FullscreenController : public base::RefCounted<FullscreenController> {
void ToggleFullscreenModeForTab(content::WebContents* tab,
bool enter_fullscreen);
#if defined(OS_MACOSX)
- void TogglePresentationMode(bool for_tab);
+ void TogglePresentationMode();
#endif
- // TODO(koz): Change |for_tab| to an enum.
- void ToggleFullscreenMode(bool for_tab);
+ void ToggleFullscreenMode();
+ void ToggleFullscreenModeWithExtension(const Extension& extension);
Ben Goodger (Google) 2012/02/09 19:32:49 It's not clear to me what it means to toggle fulls
hashimoto 2012/02/10 05:09:32 Done.
// Notifications.
void LostMouseLock();
@@ -87,6 +88,12 @@ class FullscreenController : public base::RefCounted<FullscreenController> {
ContentSetting GetFullscreenSetting(const GURL& url) const;
ContentSetting GetMouseLockSetting(const GURL& url) const;
+#if defined(OS_MACOSX)
+ void TogglePresentationModeInternal(bool for_tab);
+#endif
+ // TODO(koz): Change |for_tab| to an enum.
+ void ToggleFullscreenModeInternal(bool for_tab);
+
BrowserWindow* window_;
Profile* profile_;
Browser* browser_;
@@ -95,6 +102,9 @@ class FullscreenController : public base::RefCounted<FullscreenController> {
// webkitRequestFullScreen), this is its wrapper.
TabContentsWrapper* fullscreened_tab_;
+ // The extension which trigerred "browser fullscreen" mode.
+ const Extension* extension_caused_fullscreen_;
+
// True if the current tab entered fullscreen mode via webkitRequestFullScreen
bool tab_caused_fullscreen_;
// True if tab fullscreen has been allowed, either by settings or by user

Powered by Google App Engine
This is Rietveld 408576698