| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "chrome/common/pepper_flash.h" | 5 #include "chrome/common/pepper_flash.h" |
| 6 | 6 |
| 7 #include "ppapi/shared_impl/ppapi_permissions.h" | 7 #include "ppapi/shared_impl/ppapi_permissions.h" |
| 8 | 8 |
| 9 bool ConductingPepperFlashFieldTrial() { | |
| 10 #if defined(OS_WIN) | |
| 11 return true; | |
| 12 #elif defined(OS_MACOSX) | |
| 13 return true; | |
| 14 #else | |
| 15 return false; | |
| 16 #endif | |
| 17 } | |
| 18 | |
| 19 bool IsPepperFlashEnabledByDefault() { | |
| 20 #if defined(USE_AURA) | |
| 21 // Pepper Flash is required for Aura (on any OS). | |
| 22 return true; | |
| 23 #elif defined(OS_WIN) | |
| 24 return true; | |
| 25 #elif defined(OS_LINUX) | |
| 26 // For Linux, always try to use it (availability is checked elsewhere). | |
| 27 return true; | |
| 28 #elif defined(OS_MACOSX) | |
| 29 return true; | |
| 30 #else | |
| 31 return false; | |
| 32 #endif | |
| 33 } | |
| 34 | |
| 35 int32 kPepperFlashPermissions = ppapi::PERMISSION_DEV | | 9 int32 kPepperFlashPermissions = ppapi::PERMISSION_DEV | |
| 36 ppapi::PERMISSION_PRIVATE | | 10 ppapi::PERMISSION_PRIVATE | |
| 37 ppapi::PERMISSION_BYPASS_USER_GESTURE | | 11 ppapi::PERMISSION_BYPASS_USER_GESTURE | |
| 38 ppapi::PERMISSION_FLASH; | 12 ppapi::PERMISSION_FLASH; |
| 39 | 13 |
| 40 | |
| OLD | NEW |