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 <map> | 9 #include <map> |
10 #include <memory> | 10 #include <memory> |
(...skipping 26 matching lines...) Expand all Loading... |
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" | |
48 #include "ui/base/l10n/l10n_util.h" | 47 #include "ui/base/l10n/l10n_util.h" |
49 #include "ui/base/layout.h" | 48 #include "ui/base/layout.h" |
50 #include "ui/base/resource/resource_bundle.h" | 49 #include "ui/base/resource/resource_bundle.h" |
51 #include "widevine_cdm_version.h" // In SHARED_INTERMEDIATE_DIR. | 50 #include "widevine_cdm_version.h" // In SHARED_INTERMEDIATE_DIR. |
52 | 51 |
53 #if defined(OS_LINUX) | 52 #if defined(OS_LINUX) |
54 #include <fcntl.h> | 53 #include <fcntl.h> |
55 #include "chrome/common/component_flash_hint_file_linux.h" | 54 #include "chrome/common/component_flash_hint_file_linux.h" |
56 #include "sandbox/linux/services/credentials.h" | 55 #include "sandbox/linux/services/credentials.h" |
57 #endif // defined(OS_LINUX) | 56 #endif // defined(OS_LINUX) |
(...skipping 12 matching lines...) Expand all Loading... |
70 #include "chrome/common/extensions/extension_process_policy.h" | 69 #include "chrome/common/extensions/extension_process_policy.h" |
71 #include "extensions/common/features/feature_util.h" | 70 #include "extensions/common/features/feature_util.h" |
72 #endif | 71 #endif |
73 | 72 |
74 #if defined(ENABLE_PLUGINS) | 73 #if defined(ENABLE_PLUGINS) |
75 #include "content/public/common/pepper_plugin_info.h" | 74 #include "content/public/common/pepper_plugin_info.h" |
76 #include "flapper_version.h" // nogncheck In SHARED_INTERMEDIATE_DIR. | 75 #include "flapper_version.h" // nogncheck In SHARED_INTERMEDIATE_DIR. |
77 #include "ppapi/shared_impl/ppapi_permissions.h" | 76 #include "ppapi/shared_impl/ppapi_permissions.h" |
78 #endif | 77 #endif |
79 | 78 |
80 #if defined(WIDEVINE_CDM_AVAILABLE) && BUILDFLAG(ENABLE_PEPPER_CDMS) && \ | 79 #if defined(WIDEVINE_CDM_AVAILABLE) && defined(ENABLE_PEPPER_CDMS) && \ |
81 !defined(WIDEVINE_CDM_IS_COMPONENT) | 80 !defined(WIDEVINE_CDM_IS_COMPONENT) |
82 #define WIDEVINE_CDM_AVAILABLE_NOT_COMPONENT | 81 #define WIDEVINE_CDM_AVAILABLE_NOT_COMPONENT |
83 #include "chrome/common/widevine_cdm_constants.h" | 82 #include "chrome/common/widevine_cdm_constants.h" |
84 #endif | 83 #endif |
85 | 84 |
86 #if defined(OS_ANDROID) | 85 #if defined(OS_ANDROID) |
87 #include "chrome/common/chrome_media_client_android.h" | 86 #include "chrome/common/chrome_media_client_android.h" |
88 #endif | 87 #endif |
89 | 88 |
90 namespace { | 89 namespace { |
(...skipping 593 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
684 if (!origin_trial_policy_) | 683 if (!origin_trial_policy_) |
685 origin_trial_policy_ = base::MakeUnique<ChromeOriginTrialPolicy>(); | 684 origin_trial_policy_ = base::MakeUnique<ChromeOriginTrialPolicy>(); |
686 return origin_trial_policy_.get(); | 685 return origin_trial_policy_.get(); |
687 } | 686 } |
688 | 687 |
689 #if defined(OS_ANDROID) | 688 #if defined(OS_ANDROID) |
690 media::MediaClientAndroid* ChromeContentClient::GetMediaClientAndroid() { | 689 media::MediaClientAndroid* ChromeContentClient::GetMediaClientAndroid() { |
691 return new ChromeMediaClientAndroid(); | 690 return new ChromeMediaClientAndroid(); |
692 } | 691 } |
693 #endif // OS_ANDROID | 692 #endif // OS_ANDROID |
OLD | NEW |