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

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 copyright, compile erorr. Moved browser.h/cc change to this patch set. 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..bd8a974d7b7aaf9bc6530b794bd173fc6c087d01 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);
// Notifications.
void LostMouseLock();
@@ -65,7 +66,8 @@ class FullscreenController : public base::RefCounted<FullscreenController> {
void WindowFullscreenStateChanged();
bool HandleUserPressedEscape();
- FullscreenExitBubbleType GetFullscreenExitBubbleType() const;
+ FullscreenExitBubbleType GetFullscreenExitBubbleType(
+ const Extension* extension) const;
private:
enum MouseLockState {
@@ -87,6 +89,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, const Extension* extension);
+
BrowserWindow* window_;
Profile* profile_;
Browser* browser_;

Powered by Google App Engine
This is Rietveld 408576698