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

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

Issue 1907263003: media: Set MediaClientAndroid in the GPU process. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 7 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/chrome_content_client.h ('k') | chrome/common/chrome_media_client_android.h » ('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 "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 #include <tuple> 10 #include <tuple>
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after
72 #include "flapper_version.h" // nogncheck In SHARED_INTERMEDIATE_DIR. 72 #include "flapper_version.h" // nogncheck In SHARED_INTERMEDIATE_DIR.
73 #include "ppapi/shared_impl/ppapi_permissions.h" 73 #include "ppapi/shared_impl/ppapi_permissions.h"
74 #endif 74 #endif
75 75
76 #if defined(WIDEVINE_CDM_AVAILABLE) && defined(ENABLE_PEPPER_CDMS) && \ 76 #if defined(WIDEVINE_CDM_AVAILABLE) && defined(ENABLE_PEPPER_CDMS) && \
77 !defined(WIDEVINE_CDM_IS_COMPONENT) 77 !defined(WIDEVINE_CDM_IS_COMPONENT)
78 #define WIDEVINE_CDM_AVAILABLE_NOT_COMPONENT 78 #define WIDEVINE_CDM_AVAILABLE_NOT_COMPONENT
79 #include "chrome/common/widevine_cdm_constants.h" 79 #include "chrome/common/widevine_cdm_constants.h"
80 #endif 80 #endif
81 81
82 #if defined(OS_ANDROID)
83 #include "chrome/common/chrome_media_client_android.h"
84 #endif
85
82 namespace { 86 namespace {
83 87
84 #if defined(ENABLE_PLUGINS) 88 #if defined(ENABLE_PLUGINS)
85 #if defined(ENABLE_PDF) 89 #if defined(ENABLE_PDF)
86 const char kPDFPluginExtension[] = "pdf"; 90 const char kPDFPluginExtension[] = "pdf";
87 const char kPDFPluginDescription[] = "Portable Document Format"; 91 const char kPDFPluginDescription[] = "Portable Document Format";
88 const char kPDFPluginOutOfProcessMimeType[] = 92 const char kPDFPluginOutOfProcessMimeType[] =
89 "application/x-google-chrome-pdf"; 93 "application/x-google-chrome-pdf";
90 const uint32_t kPDFPluginPermissions = 94 const uint32_t kPDFPluginPermissions =
91 ppapi::PERMISSION_PRIVATE | ppapi::PERMISSION_DEV; 95 ppapi::PERMISSION_PRIVATE | ppapi::PERMISSION_DEV;
(...skipping 588 matching lines...) Expand 10 before | Expand all | Expand 10 after
680 #if defined(ENABLE_EXTENSIONS) 684 #if defined(ENABLE_EXTENSIONS)
681 return extensions::IsIsolateExtensionsEnabled(); 685 return extensions::IsIsolateExtensionsEnabled();
682 #else 686 #else
683 return false; 687 return false;
684 #endif 688 #endif
685 } 689 }
686 690
687 base::StringPiece ChromeContentClient::GetOriginTrialPublicKey() { 691 base::StringPiece ChromeContentClient::GetOriginTrialPublicKey() {
688 return origin_trial_key_manager_.GetPublicKey(); 692 return origin_trial_key_manager_.GetPublicKey();
689 } 693 }
694
695 #if defined(OS_ANDROID)
696 media::MediaClientAndroid* ChromeContentClient::GetMediaClientAndroid() {
697 return new ChromeMediaClientAndroid();
698 }
699 #endif // OS_ANDROID
OLDNEW
« no previous file with comments | « chrome/common/chrome_content_client.h ('k') | chrome/common/chrome_media_client_android.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698