Chromium Code Reviews| Index: chrome/browser/ui/browser.h |
| diff --git a/chrome/browser/ui/browser.h b/chrome/browser/ui/browser.h |
| index 59e33873779f211f110daabb56331c2edfd2f79e..535a6a7b9fe0bd9bf71df8748688ee83ed615725 100644 |
| --- a/chrome/browser/ui/browser.h |
| +++ b/chrome/browser/ui/browser.h |
| @@ -892,7 +892,10 @@ class Browser : public TabHandlerDelegate, |
| // True when the current tab is in fullscreen mode, requested by |
|
sky
2012/03/22 22:48:10
Update comments. To avoid duplicating what you hav
scheib
2012/03/26 23:30:46
Done.
|
| // webkitRequestFullScreen. |
| - bool IsFullscreenForTab() const; |
| + 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(); |
| @@ -910,14 +913,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); |
| @@ -1039,7 +1040,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, |