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/requirements_checker.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/requirements_checker.cc')
| -rw-r--r-- | chrome/browser/extensions/requirements_checker.cc | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/chrome/browser/extensions/requirements_checker.cc b/chrome/browser/extensions/requirements_checker.cc index 516f5b0..d350e0d 100644 --- a/chrome/browser/extensions/requirements_checker.cc +++ b/chrome/browser/extensions/requirements_checker.cc @@ -15,6 +15,10 @@ #include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" +#if defined(OS_WIN) +#include "base/win/metro.h" +#endif // defined(OS_WIN) + namespace extensions { RequirementsChecker::RequirementsChecker() @@ -36,6 +40,12 @@ void RequirementsChecker::Check(scoped_refptr<const Extension> extension, errors_.push_back( l10n_util::GetStringUTF8(IDS_EXTENSION_NPAPI_NOT_SUPPORTED)); #endif // defined(OS_CHROMEOS) +#if defined(OS_WIN) + if (base::win::IsMetroProcess()) { + errors_.push_back( + l10n_util::GetStringUTF8(IDS_EXTENSION_NPAPI_NOT_SUPPORTED)); + } +#endif // defined(OS_WIN) } if (requirements.webgl) { |