Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(9833)

Unified Diff: chrome/common/pepper_flash.cc

Issue 10773002: Enable Pepper Flash by default on any channel on Windows. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/common/pepper_flash.cc
===================================================================
--- chrome/common/pepper_flash.cc (revision 145683)
+++ chrome/common/pepper_flash.cc (working copy)
@@ -92,16 +92,7 @@
// 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;
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698