| 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);
|
|
|
|
|