diff options
| author | shess@chromium.org <shess@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-05 00:27:41 +0000 |
|---|---|---|
| committer | shess@chromium.org <shess@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-05 00:27:41 +0000 |
| commit | 56510ba355dee2cd6592cdf0d27c4c41ef0cae8b (patch) | |
| tree | 6bbd0169df49c97a12f6915624ae5e8ca01a4945 /chrome/common/pepper_flash.cc | |
| parent | 64f3b2e53900b02337eef809c49029f5cb0bf95c (diff) | |
| download | chromium_src-56510ba355dee2cd6592cdf0d27c4c41ef0cae8b.zip chromium_src-56510ba355dee2cd6592cdf0d27c4c41ef0cae8b.tar.gz chromium_src-56510ba355dee2cd6592cdf0d27c4c41ef0cae8b.tar.bz2 | |
Add PepperFlash to OSX Canary build.
Add it to the build, and show it between inbuilt NPAPI Flash and any
system NPAPI Flash on Canary.
BUG=115437
TEST=PepperFlashPlayer.plugin is in the bundle.
TEST=about:plugins shows it after inbuilt NPAPI Flash.
TEST=PepperFlash loads and plays a YouTube video or something.
Review URL: https://chromiumcodereview.appspot.com/10494003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@140445 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common/pepper_flash.cc')
| -rw-r--r-- | chrome/common/pepper_flash.cc | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/chrome/common/pepper_flash.cc b/chrome/common/pepper_flash.cc index 8f0a721..0f4a6cc 100644 --- a/chrome/common/pepper_flash.cc +++ b/chrome/common/pepper_flash.cc @@ -68,6 +68,20 @@ bool IsInFieldTrialGroup() { bool ConductingPepperFlashFieldTrial() { #if defined(OS_WIN) return true; +#elif defined(OS_MACOSX) + // TODO(shess): This is sort of abusive. Initially PepperFlash + // should be present in about:plugins but not enabled in preference + // to NPAPI Flash. Returning |true| here causes + // BrowserProcessImpl::PreMainMessageLoopRun() to find PepperFlash + // after the built-in NPAPI Flash. Returning |false| from + // IsPepperFlashEnabledByDefault() prevents PepperFlash from being + // moved above NPAPI Flash. + chrome::VersionInfo::Channel channel = chrome::VersionInfo::GetChannel(); + if (channel == chrome::VersionInfo::CHANNEL_CANARY) + return true; + + // TODO(shess): Don't expose for other channels, yet. + return false; #else return false; #endif @@ -91,6 +105,9 @@ bool IsPepperFlashEnabledByDefault() { #elif defined(OS_LINUX) // For Linux, always try to use it (availability is checked elsewhere). return true; +#elif defined(OS_MACOSX) + // Don't enable PepperFlash in preference to NPAPI Flash. + return false; #else return false; #endif |