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 "base/basictypes.h" | 7 #include "base/basictypes.h" |
8 #include "base/command_line.h" | 8 #include "base/command_line.h" |
9 #include "base/memory/ref_counted.h" | 9 #include "base/memory/ref_counted.h" |
10 #include "base/metrics/field_trial.h" | 10 #include "base/metrics/field_trial.h" |
11 #include "chrome/common/chrome_switches.h" | 11 #include "chrome/common/chrome_switches.h" |
12 #include "chrome/common/chrome_version_info.h" | 12 #include "chrome/common/chrome_version_info.h" |
| 13 #include "ppapi/shared_impl/ppapi_permissions.h" |
13 | 14 |
14 #if defined(OS_WIN) | 15 #if defined(OS_WIN) |
15 #include "base/win/metro.h" | 16 #include "base/win/metro.h" |
16 #endif | 17 #endif |
17 | 18 |
18 namespace { | 19 namespace { |
19 | 20 |
20 const char* const kFieldTrialName = "ApplyPepperFlash"; | 21 const char* const kFieldTrialName = "ApplyPepperFlash"; |
21 const char* const kDisableGroupName = "DisableByDefault"; | 22 const char* const kDisableGroupName = "DisableByDefault"; |
22 const char* const kEnableGroupName = "EnableByDefault"; | 23 const char* const kEnableGroupName = "EnableByDefault"; |
(...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
100 if (channel == chrome::VersionInfo::CHANNEL_CANARY || | 101 if (channel == chrome::VersionInfo::CHANNEL_CANARY || |
101 channel == chrome::VersionInfo::CHANNEL_DEV) | 102 channel == chrome::VersionInfo::CHANNEL_DEV) |
102 return true; | 103 return true; |
103 | 104 |
104 // PepperFlash is opt-in on any other channels where it is exposed. | 105 // PepperFlash is opt-in on any other channels where it is exposed. |
105 return false; | 106 return false; |
106 #else | 107 #else |
107 return false; | 108 return false; |
108 #endif | 109 #endif |
109 } | 110 } |
| 111 |
| 112 int32 kPepperFlashPermissions = ppapi::PERMISSION_DEV | |
| 113 ppapi::PERMISSION_PRIVATE | |
| 114 ppapi::PERMISSION_BYPASS_USER_GESTURE; |
| 115 |
| 116 |
OLD | NEW |