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

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

Issue 2411433002: Move ENABLE_PEPPER_CDMS to a buildflag header. (Closed)
Patch Set: Fixes Created 4 years, 2 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/BUILD.gn ('k') | chrome/common/chrome_paths.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 "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 <map> 9 #include <map>
10 #include <memory> 10 #include <memory>
(...skipping 26 matching lines...) Expand all
37 #include "components/dom_distiller/core/url_constants.h" 37 #include "components/dom_distiller/core/url_constants.h"
38 #include "components/version_info/version_info.h" 38 #include "components/version_info/version_info.h"
39 #include "content/public/common/cdm_info.h" 39 #include "content/public/common/cdm_info.h"
40 #include "content/public/common/content_constants.h" 40 #include "content/public/common/content_constants.h"
41 #include "content/public/common/content_switches.h" 41 #include "content/public/common/content_switches.h"
42 #include "content/public/common/url_constants.h" 42 #include "content/public/common/url_constants.h"
43 #include "content/public/common/user_agent.h" 43 #include "content/public/common/user_agent.h"
44 #include "extensions/common/constants.h" 44 #include "extensions/common/constants.h"
45 #include "gpu/config/gpu_info.h" 45 #include "gpu/config/gpu_info.h"
46 #include "net/http/http_util.h" 46 #include "net/http/http_util.h"
47 #include "ppapi/features/features.h"
47 #include "ui/base/l10n/l10n_util.h" 48 #include "ui/base/l10n/l10n_util.h"
48 #include "ui/base/layout.h" 49 #include "ui/base/layout.h"
49 #include "ui/base/resource/resource_bundle.h" 50 #include "ui/base/resource/resource_bundle.h"
50 #include "widevine_cdm_version.h" // In SHARED_INTERMEDIATE_DIR. 51 #include "widevine_cdm_version.h" // In SHARED_INTERMEDIATE_DIR.
51 52
52 #if defined(OS_LINUX) 53 #if defined(OS_LINUX)
53 #include <fcntl.h> 54 #include <fcntl.h>
54 #include "chrome/common/component_flash_hint_file_linux.h" 55 #include "chrome/common/component_flash_hint_file_linux.h"
55 #include "sandbox/linux/services/credentials.h" 56 #include "sandbox/linux/services/credentials.h"
56 #endif // defined(OS_LINUX) 57 #endif // defined(OS_LINUX)
(...skipping 12 matching lines...) Expand all
69 #include "chrome/common/extensions/extension_process_policy.h" 70 #include "chrome/common/extensions/extension_process_policy.h"
70 #include "extensions/common/features/feature_util.h" 71 #include "extensions/common/features/feature_util.h"
71 #endif 72 #endif
72 73
73 #if defined(ENABLE_PLUGINS) 74 #if defined(ENABLE_PLUGINS)
74 #include "content/public/common/pepper_plugin_info.h" 75 #include "content/public/common/pepper_plugin_info.h"
75 #include "flapper_version.h" // nogncheck In SHARED_INTERMEDIATE_DIR. 76 #include "flapper_version.h" // nogncheck In SHARED_INTERMEDIATE_DIR.
76 #include "ppapi/shared_impl/ppapi_permissions.h" 77 #include "ppapi/shared_impl/ppapi_permissions.h"
77 #endif 78 #endif
78 79
79 #if defined(WIDEVINE_CDM_AVAILABLE) && defined(ENABLE_PEPPER_CDMS) && \ 80 #if defined(WIDEVINE_CDM_AVAILABLE) && BUILDFLAG(ENABLE_PEPPER_CDMS) && \
80 !defined(WIDEVINE_CDM_IS_COMPONENT) 81 !defined(WIDEVINE_CDM_IS_COMPONENT)
81 #define WIDEVINE_CDM_AVAILABLE_NOT_COMPONENT 82 #define WIDEVINE_CDM_AVAILABLE_NOT_COMPONENT
82 #include "chrome/common/widevine_cdm_constants.h" 83 #include "chrome/common/widevine_cdm_constants.h"
83 #endif 84 #endif
84 85
85 #if defined(OS_ANDROID) 86 #if defined(OS_ANDROID)
86 #include "chrome/common/chrome_media_client_android.h" 87 #include "chrome/common/chrome_media_client_android.h"
87 #endif 88 #endif
88 89
89 namespace { 90 namespace {
(...skipping 593 matching lines...) Expand 10 before | Expand all | Expand 10 after
683 if (!origin_trial_policy_) 684 if (!origin_trial_policy_)
684 origin_trial_policy_ = base::MakeUnique<ChromeOriginTrialPolicy>(); 685 origin_trial_policy_ = base::MakeUnique<ChromeOriginTrialPolicy>();
685 return origin_trial_policy_.get(); 686 return origin_trial_policy_.get();
686 } 687 }
687 688
688 #if defined(OS_ANDROID) 689 #if defined(OS_ANDROID)
689 media::MediaClientAndroid* ChromeContentClient::GetMediaClientAndroid() { 690 media::MediaClientAndroid* ChromeContentClient::GetMediaClientAndroid() {
690 return new ChromeMediaClientAndroid(); 691 return new ChromeMediaClientAndroid();
691 } 692 }
692 #endif // OS_ANDROID 693 #endif // OS_ANDROID
OLDNEW
« no previous file with comments | « chrome/common/BUILD.gn ('k') | chrome/common/chrome_paths.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698