| 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 59 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 70 #endif | 70 #endif |
| 71 | 71 |
| 72 #if BUILDFLAG(ENABLE_EXTENSIONS) | 72 #if BUILDFLAG(ENABLE_EXTENSIONS) |
| 73 #include "chrome/common/extensions/extension_process_policy.h" | 73 #include "chrome/common/extensions/extension_process_policy.h" |
| 74 #include "extensions/common/features/feature_util.h" | 74 #include "extensions/common/features/feature_util.h" |
| 75 #endif | 75 #endif |
| 76 | 76 |
| 77 #if BUILDFLAG(ENABLE_PLUGINS) | 77 #if BUILDFLAG(ENABLE_PLUGINS) |
| 78 #include "content/public/common/pepper_plugin_info.h" | 78 #include "content/public/common/pepper_plugin_info.h" |
| 79 #include "flapper_version.h" // nogncheck In SHARED_INTERMEDIATE_DIR. | 79 #include "flapper_version.h" // nogncheck In SHARED_INTERMEDIATE_DIR. |
| 80 #include "ppapi/shared_impl/ppapi_permissions.h" | 80 #include "ppapi/shared_impl/ppapi_permissions.h" // nogncheck |
| 81 #endif | 81 #endif |
| 82 | 82 |
| 83 #if defined(WIDEVINE_CDM_AVAILABLE) && BUILDFLAG(ENABLE_PEPPER_CDMS) && \ | 83 #if defined(WIDEVINE_CDM_AVAILABLE) && BUILDFLAG(ENABLE_PEPPER_CDMS) && \ |
| 84 !defined(WIDEVINE_CDM_IS_COMPONENT) | 84 !defined(WIDEVINE_CDM_IS_COMPONENT) |
| 85 #define WIDEVINE_CDM_AVAILABLE_NOT_COMPONENT | 85 #define WIDEVINE_CDM_AVAILABLE_NOT_COMPONENT |
| 86 #include "chrome/common/widevine_cdm_constants.h" | 86 #include "chrome/common/widevine_cdm_constants.h" |
| 87 #endif | 87 #endif |
| 88 | 88 |
| 89 #if defined(OS_ANDROID) | 89 #if defined(OS_ANDROID) |
| 90 #include "chrome/common/chrome_media_client_android.h" | 90 #include "chrome/common/chrome_media_client_android.h" |
| (...skipping 603 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 694 if (!origin_trial_policy_) | 694 if (!origin_trial_policy_) |
| 695 origin_trial_policy_ = base::MakeUnique<ChromeOriginTrialPolicy>(); | 695 origin_trial_policy_ = base::MakeUnique<ChromeOriginTrialPolicy>(); |
| 696 return origin_trial_policy_.get(); | 696 return origin_trial_policy_.get(); |
| 697 } | 697 } |
| 698 | 698 |
| 699 #if defined(OS_ANDROID) | 699 #if defined(OS_ANDROID) |
| 700 media::MediaClientAndroid* ChromeContentClient::GetMediaClientAndroid() { | 700 media::MediaClientAndroid* ChromeContentClient::GetMediaClientAndroid() { |
| 701 return new ChromeMediaClientAndroid(); | 701 return new ChromeMediaClientAndroid(); |
| 702 } | 702 } |
| 703 #endif // OS_ANDROID | 703 #endif // OS_ANDROID |
| OLD | NEW |