diff options
author | yzshen@chromium.org <yzshen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-10 09:02:40 +0000 |
---|---|---|
committer | yzshen@chromium.org <yzshen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-10 09:02:40 +0000 |
commit | f6bfcf2755f1e3694d56d8cb2235a04d4d242448 (patch) | |
tree | e7db9601a3d0b5acb19df7c209f05652c7407692 /chrome | |
parent | 03bdcc125c73f2a13452ffd6ede45523c2879fd3 (diff) | |
download | chromium_src-f6bfcf2755f1e3694d56d8cb2235a04d4d242448.zip chromium_src-f6bfcf2755f1e3694d56d8cb2235a04d4d242448.tar.gz chromium_src-f6bfcf2755f1e3694d56d8cb2235a04d4d242448.tar.bz2 |
Enable Pepper Flash by default on any channel on Windows.
BUG=None
Test=None
Review URL: https://chromiumcodereview.appspot.com/10773002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@145855 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
-rw-r--r-- | chrome/common/pepper_flash.cc | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/chrome/common/pepper_flash.cc b/chrome/common/pepper_flash.cc index 959d373..0217f4d 100644 --- a/chrome/common/pepper_flash.cc +++ b/chrome/common/pepper_flash.cc @@ -92,16 +92,7 @@ bool IsPepperFlashEnabledByDefault() { // Pepper Flash is required for Aura (on any OS). return true; #elif defined(OS_WIN) - // Pepper Flash is required for Windows 8 Metro mode. - if (base::win::IsMetroProcess()) - return true; - - chrome::VersionInfo::Channel channel = chrome::VersionInfo::GetChannel(); - if (channel == chrome::VersionInfo::CHANNEL_CANARY) - return true; - - // For other Windows users, enable only for Dev users in a field trial. - return channel == chrome::VersionInfo::CHANNEL_DEV && IsInFieldTrialGroup(); + return true; #elif defined(OS_LINUX) // For Linux, always try to use it (availability is checked elsewhere). return true; |