summaryrefslogtreecommitdiffstats
path: root/chrome/browser/extensions/extension_popup_apitest.cc
diff options
context:
space:
mode:
authortwiz@google.com <twiz@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-12-08 04:28:58 +0000
committertwiz@google.com <twiz@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-12-08 04:28:58 +0000
commitbf7e9637d7935075e56bd3d15df864f78312df53 (patch)
tree30ee46ce46c99585a43f9dc06788e69772f18bd1 /chrome/browser/extensions/extension_popup_apitest.cc
parente36ddc88da9374cfa6853101b2b81eb20a081026 (diff)
downloadchromium_src-bf7e9637d7935075e56bd3d15df864f78312df53.zip
chromium_src-bf7e9637d7935075e56bd3d15df864f78312df53.tar.gz
chromium_src-bf7e9637d7935075e56bd3d15df864f78312df53.tar.bz2
Addition of a new parameter to the popup.show(...) Chrome extension API that allows the caller to specify the behaviour of the window focus when the pop-up is displayed.
I added a test for the new parameter in the ExtensionApiTest.FLAKY_Popup test. I also corrected a truncated string in the unit-test. Because the pop-up actually uses two windows, I had to change the WidgetWin::Show() routine to also reposition the window at the top. If a window is shown and activated, it is automatically brought to the front. Because we don't activate the pop-up when we want to keep the focus in the current extension view, I had to bring it to the front so that it wouldn't be hidden behind the 'chrome-bubble' window. BUG=none TEST=ExtensionApiTest.FLAKY_Popup Review URL: http://codereview.chromium.org/454019 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@34037 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/extension_popup_apitest.cc')
-rw-r--r--chrome/browser/extensions/extension_popup_apitest.cc2
1 files changed, 2 insertions, 0 deletions
diff --git a/chrome/browser/extensions/extension_popup_apitest.cc b/chrome/browser/extensions/extension_popup_apitest.cc
index d8e33af..16c5374 100644
--- a/chrome/browser/extensions/extension_popup_apitest.cc
+++ b/chrome/browser/extensions/extension_popup_apitest.cc
@@ -10,5 +10,7 @@
IN_PROC_BROWSER_TEST_F(ExtensionApiTest, FLAKY_Popup) {
CommandLine::ForCurrentProcess()->AppendSwitch(
switches::kEnableExperimentalExtensionApis);
+ CommandLine::ForCurrentProcess()->AppendSwitch(
+ switches::kEnableExtensionToolstrips);
ASSERT_TRUE(RunExtensionTest("popup_api")) << message_;
}