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/chrome_content_client.h" | 5 #include "chrome/common/chrome_content_client.h" |
6 | 6 |
7 #include <stdint.h> | 7 #include <stdint.h> |
8 | 8 |
9 #include <memory> | 9 #include <memory> |
10 | 10 |
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
70 #include "content/public/common/pepper_plugin_info.h" | 70 #include "content/public/common/pepper_plugin_info.h" |
71 #include "flapper_version.h" // nogncheck In SHARED_INTERMEDIATE_DIR. | 71 #include "flapper_version.h" // nogncheck In SHARED_INTERMEDIATE_DIR. |
72 #include "ppapi/shared_impl/ppapi_permissions.h" | 72 #include "ppapi/shared_impl/ppapi_permissions.h" |
73 #endif | 73 #endif |
74 | 74 |
75 #if defined(WIDEVINE_CDM_AVAILABLE) && defined(ENABLE_PEPPER_CDMS) && \ | 75 #if defined(WIDEVINE_CDM_AVAILABLE) && defined(ENABLE_PEPPER_CDMS) && \ |
76 !defined(WIDEVINE_CDM_IS_COMPONENT) | 76 !defined(WIDEVINE_CDM_IS_COMPONENT) |
77 #include "chrome/common/widevine_cdm_constants.h" | 77 #include "chrome/common/widevine_cdm_constants.h" |
78 #endif | 78 #endif |
79 | 79 |
| 80 #if defined(OS_ANDROID) |
| 81 #include "chrome/common/chrome_media_client_android.h" |
| 82 #endif |
| 83 |
80 namespace { | 84 namespace { |
81 | 85 |
82 #if defined(ENABLE_PLUGINS) | 86 #if defined(ENABLE_PLUGINS) |
83 #if defined(ENABLE_PDF) | 87 #if defined(ENABLE_PDF) |
84 const char kPDFPluginExtension[] = "pdf"; | 88 const char kPDFPluginExtension[] = "pdf"; |
85 const char kPDFPluginDescription[] = "Portable Document Format"; | 89 const char kPDFPluginDescription[] = "Portable Document Format"; |
86 const char kPDFPluginOutOfProcessMimeType[] = | 90 const char kPDFPluginOutOfProcessMimeType[] = |
87 "application/x-google-chrome-pdf"; | 91 "application/x-google-chrome-pdf"; |
88 const uint32_t kPDFPluginPermissions = | 92 const uint32_t kPDFPluginPermissions = |
89 ppapi::PERMISSION_PRIVATE | ppapi::PERMISSION_DEV; | 93 ppapi::PERMISSION_PRIVATE | ppapi::PERMISSION_DEV; |
(...skipping 550 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
640 #if defined(ENABLE_EXTENSIONS) | 644 #if defined(ENABLE_EXTENSIONS) |
641 return extensions::IsIsolateExtensionsEnabled(); | 645 return extensions::IsIsolateExtensionsEnabled(); |
642 #else | 646 #else |
643 return false; | 647 return false; |
644 #endif | 648 #endif |
645 } | 649 } |
646 | 650 |
647 base::StringPiece ChromeContentClient::GetOriginTrialPublicKey() { | 651 base::StringPiece ChromeContentClient::GetOriginTrialPublicKey() { |
648 return origin_trial_key_manager_.GetPublicKey(); | 652 return origin_trial_key_manager_.GetPublicKey(); |
649 } | 653 } |
| 654 |
| 655 #if defined(OS_ANDROID) |
| 656 media::MediaClientAndroid* ChromeContentClient::GetMediaClientAndroid() { |
| 657 return new ChromeMediaClientAndroid(); |
| 658 } |
| 659 #endif // OS_ANDROID |
OLD | NEW |