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

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

Issue 7890056: FullscreenExitBubble temp UI for Mac. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: fix url? Created 9 years, 3 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
« no previous file with comments | « chrome/app/nibs/FullscreenExitBubble.xib ('k') | chrome/browser/ui/browser.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/browser.h
diff --git a/chrome/browser/ui/browser.h b/chrome/browser/ui/browser.h
index 00f644074f9a84ccbdbb0e5203827f63393130ce..1316b78de773a4c2592a1745ede869bcc1ecb591 100644
--- a/chrome/browser/ui/browser.h
+++ b/chrome/browser/ui/browser.h
@@ -839,6 +839,10 @@ class Browser : public TabHandlerDelegate,
bool is_app() const;
bool is_devtools() const;
+ // True when the current tab is in fullscreen mode, requested by
+ // webkitRequestFullScreen.
+ bool is_fullscreen_for_tab() const { return fullscreened_tab_ != NULL; }
+
protected:
// Wrapper for the factory method in BrowserWindow. This allows subclasses to
// set their own window.
@@ -852,6 +856,7 @@ class Browser : public TabHandlerDelegate,
FRIEND_TEST_ALL_PREFIXES(BrowserTest, AppIdSwitch);
FRIEND_TEST_ALL_PREFIXES(BrowserTest, TestNewTabExitsFullscreen);
FRIEND_TEST_ALL_PREFIXES(BrowserTest, TestTabExitsItselfFromFullscreen);
+ FRIEND_TEST_ALL_PREFIXES(BrowserTest, TabEntersPresentationModeFromWindowed);
FRIEND_TEST_ALL_PREFIXES(BrowserInitTest, OpenAppShortcutNoPref);
FRIEND_TEST_ALL_PREFIXES(BrowserInitTest, OpenAppShortcutWindowPref);
FRIEND_TEST_ALL_PREFIXES(BrowserInitTest, OpenAppShortcutTabPref);
@@ -1421,10 +1426,11 @@ class Browser : public TabHandlerDelegate,
BookmarkBar::State bookmark_bar_state_;
- // Tab to notify when the browser exits fullscreen mode.
+ // If there is currently a tab in fullscreen mode (entered via
+ // webkitRequestFullScreen), this is its wrapper.
TabContentsWrapper* fullscreened_tab_;
- // True if the current tab is in fullscreen mode.
+ // True if the current tab entered fullscreen mode via webkitRequestFullScreen
bool tab_caused_fullscreen_;
DISALLOW_COPY_AND_ASSIGN(Browser);
« no previous file with comments | « chrome/app/nibs/FullscreenExitBubble.xib ('k') | chrome/browser/ui/browser.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698