summaryrefslogtreecommitdiffstats
path: root/chrome/browser/extensions/extension_tabs_apitest.cc
diff options
context:
space:
mode:
authorthakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-17 06:11:53 +0000
committerthakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-17 06:11:53 +0000
commit8d944b369dc0979cc9926cdda7673682bf8e5bef (patch)
treecf597f2b4443c04d48b14dfa2fc434984a058c90 /chrome/browser/extensions/extension_tabs_apitest.cc
parent700317717262a7a81f38c6850e7b1e678ad5b7b7 (diff)
downloadchromium_src-8d944b369dc0979cc9926cdda7673682bf8e5bef.zip
chromium_src-8d944b369dc0979cc9926cdda7673682bf8e5bef.tar.gz
chromium_src-8d944b369dc0979cc9926cdda7673682bf8e5bef.tar.bz2
Change EnterFullscreen() to take an enum instead of a bool as second parameter.
Also, add a UpdateFullscreenExitBubbleContent() method. At both call site and implementor side, just funnel the previous bool through the enum for now. This decouples the implementation of the new UI from the backend support. Based on a patch by Yuzhu Shen <yzshen@chromium.org> BUG=95136 TEST=everything works as before TBR=ben (OWNERS review for this part is at http://codereview.chromium.org/8274022/ ) Review URL: http://codereview.chromium.org/8313012 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@105770 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/extension_tabs_apitest.cc')
-rw-r--r--chrome/browser/extensions/extension_tabs_apitest.cc6
1 files changed, 4 insertions, 2 deletions
diff --git a/chrome/browser/extensions/extension_tabs_apitest.cc b/chrome/browser/extensions/extension_tabs_apitest.cc
index 8dafbb2..672f6a7 100644
--- a/chrome/browser/extensions/extension_tabs_apitest.cc
+++ b/chrome/browser/extensions/extension_tabs_apitest.cc
@@ -181,7 +181,8 @@ IN_PROC_BROWSER_TEST_F(ExtensionApiTest, TabsOnUpdated) {
IN_PROC_BROWSER_TEST_F(ExtensionApiTest,
MAYBE_FocusWindowDoesNotExitFullscreen) {
- browser()->window()->EnterFullscreen(GURL(), false);
+ browser()->window()->EnterFullscreen(
+ GURL(), FEB_TYPE_BROWSER_FULLSCREEN_EXIT_INSTRUCTION);
bool is_fullscreen = browser()->window()->IsFullscreen();
ASSERT_TRUE(RunExtensionTest("window_update/focus")) << message_;
ASSERT_EQ(is_fullscreen, browser()->window()->IsFullscreen());
@@ -189,7 +190,8 @@ IN_PROC_BROWSER_TEST_F(ExtensionApiTest,
IN_PROC_BROWSER_TEST_F(ExtensionApiTest,
MAYBE_UpdateWindowSizeExitsFullscreen) {
- browser()->window()->EnterFullscreen(GURL(), false);
+ browser()->window()->EnterFullscreen(
+ GURL(), FEB_TYPE_BROWSER_FULLSCREEN_EXIT_INSTRUCTION);
ASSERT_TRUE(RunExtensionTest("window_update/sizing")) << message_;
ASSERT_FALSE(browser()->window()->IsFullscreen());
}