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

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

Issue 11896104: Refactor FullscreenController removing TogglePresentationMode & adding ToggleFullscreenWithChrome. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: chrome/browser/ui/cocoa/browser_window_controller_browsertest.mm compile fix Created 7 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/fullscreen/fullscreen_controller.h
diff --git a/chrome/browser/ui/fullscreen/fullscreen_controller.h b/chrome/browser/ui/fullscreen/fullscreen_controller.h
index 6b094f0a53fc9867428ebc587c654655dfbf093e..8da996e888fb23f16bcc1e963d404fcc6b99a289 100644
--- a/chrome/browser/ui/fullscreen/fullscreen_controller.h
+++ b/chrome/browser/ui/fullscreen/fullscreen_controller.h
@@ -74,7 +74,7 @@ class FullscreenController : public content::NotificationObserver {
#endif
#if defined(OS_MACOSX)
- void TogglePresentationMode();
+ void ToggleFullscreenWithChrome();
#endif
// Mouse Lock ////////////////////////////////////////////////////////////////
@@ -130,6 +130,14 @@ class FullscreenController : public content::NotificationObserver {
MOUSELOCK_ACCEPTED_SILENTLY
};
+ enum FullscreenInternalOption {
+ BROWSER,
+#if defined(OS_MACOSX)
+ BROWSER_WITH_CHROME,
+#endif
+ TAB
+ };
+
void UpdateNotificationRegistrations();
// Posts a task to call NotifyFullscreenChange.
@@ -141,11 +149,9 @@ class FullscreenController : public content::NotificationObserver {
void NotifyTabOfExitIfNecessary();
void NotifyMouseLockChange();
- // TODO(koz): Change |for_tab| to an enum.
- void ToggleFullscreenModeInternal(bool for_tab);
-#if defined(OS_MACOSX)
- void TogglePresentationModeInternal(bool for_tab);
-#endif
+ void ToggleFullscreenModeInternal(FullscreenInternalOption option);
+ void EnterFullscreenModeInternal(FullscreenInternalOption option);
+ void ExitFullscreenModeInternal();
void SetFullscreenedTab(content::WebContents* tab);
void SetMouseLockTab(content::WebContents* tab);

Powered by Google App Engine
This is Rietveld 408576698