diff options
| author | joi@chromium.org <joi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-03 00:49:04 +0000 |
|---|---|---|
| committer | joi@chromium.org <joi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-03 00:49:04 +0000 |
| commit | 0d5d44b1e5043239085de5e5ea9ca4d6854bce45 (patch) | |
| tree | 6bb5d458366e7975c8820efbc6f21b660d583321 /chrome/browser/extensions | |
| parent | 58b48978267e72777344231c4680e68aa94c6add (diff) | |
| download | chromium_src-0d5d44b1e5043239085de5e5ea9ca4d6854bce45.zip chromium_src-0d5d44b1e5043239085de5e5ea9ca4d6854bce45.tar.gz chromium_src-0d5d44b1e5043239085de5e5ea9ca4d6854bce45.tar.bz2 | |
Allow experimental extension pop-ups from infobars.
BUG=none
TEST=browser_tests.exe --gtest_filter=*PopupFromInfobar*
Review URL: http://codereview.chromium.org/3127037
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@58442 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions')
| -rw-r--r-- | chrome/browser/extensions/extension_popup_api.cc | 5 | ||||
| -rw-r--r-- | chrome/browser/extensions/extension_popup_apitest.cc | 9 |
2 files changed, 11 insertions, 3 deletions
diff --git a/chrome/browser/extensions/extension_popup_api.cc b/chrome/browser/extensions/extension_popup_api.cc index 7fc8f1b..3e4f22a 100644 --- a/chrome/browser/extensions/extension_popup_api.cc +++ b/chrome/browser/extensions/extension_popup_api.cc @@ -356,10 +356,11 @@ void PopupShowFunction::Run() { } bool PopupShowFunction::RunImpl() { - // Popups may only be displayed from TAB_CONTENTS. + // Popups may only be displayed from TAB_CONTENTS and EXTENSION_INFOBAR. ViewType::Type view_type = dispatcher()->render_view_host()->delegate()->GetRenderViewType(); - if (ViewType::TAB_CONTENTS != view_type) { + if (ViewType::TAB_CONTENTS != view_type && + ViewType::EXTENSION_INFOBAR != view_type) { error_ = kPopupsDisallowed; return false; } diff --git a/chrome/browser/extensions/extension_popup_apitest.cc b/chrome/browser/extensions/extension_popup_apitest.cc index 6021f00..83f5717 100644 --- a/chrome/browser/extensions/extension_popup_apitest.cc +++ b/chrome/browser/extensions/extension_popup_apitest.cc @@ -11,5 +11,12 @@ IN_PROC_BROWSER_TEST_F(ExtensionApiTest, FLAKY_Popup) { CommandLine::ForCurrentProcess()->AppendSwitch( switches::kEnableExperimentalExtensionApis); - ASSERT_TRUE(RunExtensionTest("popup")) << message_; + ASSERT_TRUE(RunExtensionTest("popup/popup_main")) << message_; +} + +IN_PROC_BROWSER_TEST_F(ExtensionApiTest, PopupFromInfobar) { + CommandLine::ForCurrentProcess()->AppendSwitch( + switches::kEnableExperimentalExtensionApis); + + ASSERT_TRUE(RunExtensionTest("popup/popup_from_infobar")) << message_; } |