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

Side by Side Diff: chrome/common/pepper_flash.cc

Issue 1548153002: Switch to standard integer types in chrome/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 12 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 unified diff | Download patch
« no previous file with comments | « chrome/common/pepper_flash.h ('k') | chrome/common/pref_names.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 <stddef.h>
6
5 #include "base/strings/string_split.h" 7 #include "base/strings/string_split.h"
6 #include "base/values.h" 8 #include "base/values.h"
7 #include "base/version.h" 9 #include "base/version.h"
10 #include "build/build_config.h"
8 #include "chrome/common/pepper_flash.h" 11 #include "chrome/common/pepper_flash.h"
9 #include "chrome/common/ppapi_utils.h" 12 #include "chrome/common/ppapi_utils.h"
10 #include "ppapi/c/private/ppb_pdf.h" 13 #include "ppapi/c/private/ppb_pdf.h"
11 #include "ppapi/shared_impl/ppapi_permissions.h" 14 #include "ppapi/shared_impl/ppapi_permissions.h"
12 15
13 namespace chrome { 16 namespace chrome {
14 17
15 const int32 kPepperFlashPermissions = ppapi::PERMISSION_DEV | 18 const int32_t kPepperFlashPermissions =
16 ppapi::PERMISSION_PRIVATE | 19 ppapi::PERMISSION_DEV | ppapi::PERMISSION_PRIVATE |
17 ppapi::PERMISSION_BYPASS_USER_GESTURE | 20 ppapi::PERMISSION_BYPASS_USER_GESTURE | ppapi::PERMISSION_FLASH;
18 ppapi::PERMISSION_FLASH;
19 namespace { 21 namespace {
20 22
21 // File name of the Pepper Flash component manifest on different platforms. 23 // File name of the Pepper Flash component manifest on different platforms.
22 const char kPepperFlashManifestName[] = "Flapper"; 24 const char kPepperFlashManifestName[] = "Flapper";
23 25
24 // Name of the Pepper Flash OS in the component manifest. 26 // Name of the Pepper Flash OS in the component manifest.
25 const char kPepperFlashOperatingSystem[] = 27 const char kPepperFlashOperatingSystem[] =
26 #if defined(OS_MACOSX) 28 #if defined(OS_MACOSX)
27 "mac"; 29 "mac";
28 #elif defined(OS_WIN) 30 #elif defined(OS_WIN)
(...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after
120 std::string arch; 122 std::string arch;
121 manifest.GetStringASCII("x-ppapi-arch", &arch); 123 manifest.GetStringASCII("x-ppapi-arch", &arch);
122 if (arch != kPepperFlashArch) 124 if (arch != kPepperFlashArch)
123 return false; 125 return false;
124 126
125 *version_out = version; 127 *version_out = version;
126 return true; 128 return true;
127 } 129 }
128 130
129 } // namespace chrome 131 } // namespace chrome
OLDNEW
« no previous file with comments | « chrome/common/pepper_flash.h ('k') | chrome/common/pref_names.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698