Index: chrome/browser/ui/browser.h |
diff --git a/chrome/browser/ui/browser.h b/chrome/browser/ui/browser.h |
index d05204ea6910c99ebd53c4653389ed3d1a37e8cd..c7fda52d25c5da624dd1fa353b43fc1e82979a8d 100644 |
--- a/chrome/browser/ui/browser.h |
+++ b/chrome/browser/ui/browser.h |
@@ -909,9 +909,11 @@ 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 IsFullscreenForTab() const; |
+ // See FullscreenController::IsFullscreenForTabOrPending. |
+ bool IsFullscreenForTabOrPending() const; |
+ |
+ // True when the mouse cursor is locked or pending lock. |
+ bool IsMouseLockedOrPending() const; |
// Called each time the browser window is shown. |
void OnWindowDidShow(); |
@@ -929,14 +931,12 @@ class Browser : public TabHandlerDelegate, |
virtual BrowserWindow* CreateBrowserWindow(); |
private: |
+ friend class BrowserTest; |
FRIEND_TEST_ALL_PREFIXES(AppModeTest, EnableAppModeTest); |
FRIEND_TEST_ALL_PREFIXES(BrowserTest, NoTabsInPopups); |
FRIEND_TEST_ALL_PREFIXES(BrowserTest, ConvertTabToAppShortcut); |
FRIEND_TEST_ALL_PREFIXES(BrowserTest, OpenAppWindowLikeNtp); |
FRIEND_TEST_ALL_PREFIXES(BrowserTest, AppIdSwitch); |
- FRIEND_TEST_ALL_PREFIXES(BrowserTest, TestNewTabExitsFullscreen); |
- FRIEND_TEST_ALL_PREFIXES(BrowserTest, TestTabExitsItselfFromFullscreen); |
- FRIEND_TEST_ALL_PREFIXES(BrowserTest, TestFullscreenBubbleMouseLockState); |
FRIEND_TEST_ALL_PREFIXES(BrowserTest, TabEntersPresentationModeFromWindowed); |
FRIEND_TEST_ALL_PREFIXES(FullscreenExitBubbleControllerTest, |
DenyExitsFullscreen); |
@@ -1064,7 +1064,7 @@ class Browser : public TabHandlerDelegate, |
const FilePath& path) OVERRIDE; |
virtual void ToggleFullscreenModeForTab(content::WebContents* tab, |
bool enter_fullscreen) OVERRIDE; |
- virtual bool IsFullscreenForTab( |
+ virtual bool IsFullscreenForTabOrPending( |
const content::WebContents* tab) const OVERRIDE; |
virtual void JSOutOfMemory(content::WebContents* tab) OVERRIDE; |
virtual void RegisterProtocolHandler(content::WebContents* tab, |