diff options
| author | wez@chromium.org <wez@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-23 21:12:02 +0000 |
|---|---|---|
| committer | wez@chromium.org <wez@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-23 21:12:02 +0000 |
| commit | b7ce636b060896f2b8666ba0cf0d9cc31d051820 (patch) | |
| tree | eef611f46d5e88a7fdaf78cfc296d8820a0c202d /chrome/browser/extensions/plugin_apitest.cc | |
| parent | 1bb06b0fea520ce6e5c94148ed8df8d8dd935e80 (diff) | |
| download | chromium_src-b7ce636b060896f2b8666ba0cf0d9cc31d051820.zip chromium_src-b7ce636b060896f2b8666ba0cf0d9cc31d051820.tar.gz chromium_src-b7ce636b060896f2b8666ba0cf0d9cc31d051820.tar.bz2 | |
Allow extensions which can run without NPAPI to run under Windows 8 Metro.
Extensions which include NPAPI plugins are assumed to require them, causing
them to be blocked on Windows 8 Metro mode, where NPAPI is not supported.
This CL allows extensions which include NPAPI plugins, but which can still run
without them, to load in Windows 8 Metro mode.
It also fixes the handling of extensions with no explicit NPAPI requirement.
BUG=130405
Review URL: https://chromiumcodereview.appspot.com/10949017
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@158217 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/plugin_apitest.cc')
| -rw-r--r-- | chrome/browser/extensions/plugin_apitest.cc | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/chrome/browser/extensions/plugin_apitest.cc b/chrome/browser/extensions/plugin_apitest.cc index ad85631..42d2eb4 100644 --- a/chrome/browser/extensions/plugin_apitest.cc +++ b/chrome/browser/extensions/plugin_apitest.cc @@ -88,12 +88,12 @@ IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, MAYBE_PluginLoadUnload) { } ASSERT_TRUE(content::ExecuteJavaScriptAndExtractBool( tab->GetRenderViewHost(), L"", L"testPluginWorks()", &result)); - // We don't allow extension plugins to run on ChromeOS. - #if defined(OS_CHROMEOS) - EXPECT_FALSE(result); - #else - EXPECT_TRUE(result); - #endif + // We don't allow extension plugins to run on ChromeOS. +#if defined(OS_CHROMEOS) + EXPECT_FALSE(result); +#else + EXPECT_TRUE(result); +#endif } // Tests that private extension plugins are only visible to the extension. @@ -135,6 +135,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, PluginPrivate) { CONTENT_SETTINGS_TYPE_PLUGINS, CONTENT_SETTING_BLOCK); ASSERT_TRUE(content::ExecuteJavaScriptAndExtractBool( tab->GetRenderViewHost(), L"", L"testPluginWorks()", &result)); + // We don't allow extension plugins to run on ChromeOS. #if defined(OS_CHROMEOS) EXPECT_FALSE(result); #else |