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 "android_webview/common/aw_content_client.h" | 5 #include "android_webview/common/aw_content_client.h" |
6 | 6 |
7 #include "android_webview/common/aw_media_client_android.h" | 7 #include "android_webview/common/aw_media_drm_bridge_client.h" |
8 #include "android_webview/common/aw_resource.h" | 8 #include "android_webview/common/aw_resource.h" |
9 #include "android_webview/common/aw_version_info_values.h" | 9 #include "android_webview/common/aw_version_info_values.h" |
10 #include "android_webview/common/crash_reporter/crash_keys.h" | 10 #include "android_webview/common/crash_reporter/crash_keys.h" |
11 #include "android_webview/common/url_constants.h" | 11 #include "android_webview/common/url_constants.h" |
12 #include "base/command_line.h" | 12 #include "base/command_line.h" |
13 #include "base/debug/crash_logging.h" | 13 #include "base/debug/crash_logging.h" |
14 #include "content/public/common/content_switches.h" | 14 #include "content/public/common/content_switches.h" |
15 #include "content/public/common/user_agent.h" | 15 #include "content/public/common/user_agent.h" |
16 #include "gpu/config/gpu_info.h" | 16 #include "gpu/config/gpu_info.h" |
17 #include "ipc/ipc_message.h" | 17 #include "ipc/ipc_message.h" |
(...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
90 base::debug::SetCrashKeyValue(crash_keys::kGPUVertexShaderVersion, | 90 base::debug::SetCrashKeyValue(crash_keys::kGPUVertexShaderVersion, |
91 gpu_info.vertex_shader_version); | 91 gpu_info.vertex_shader_version); |
92 base::debug::SetCrashKeyValue(crash_keys::kGPUVendor, gpu_info.gl_vendor); | 92 base::debug::SetCrashKeyValue(crash_keys::kGPUVendor, gpu_info.gl_vendor); |
93 base::debug::SetCrashKeyValue(crash_keys::kGPURenderer, gpu_info.gl_renderer); | 93 base::debug::SetCrashKeyValue(crash_keys::kGPURenderer, gpu_info.gl_renderer); |
94 } | 94 } |
95 | 95 |
96 bool AwContentClient::UsingSynchronousCompositing() { | 96 bool AwContentClient::UsingSynchronousCompositing() { |
97 return true; | 97 return true; |
98 } | 98 } |
99 | 99 |
100 media::MediaClientAndroid* AwContentClient::GetMediaClientAndroid() { | 100 media::MediaDrmBridgeClient* AwContentClient::GetMediaDrmBridgeClient() { |
101 return new AwMediaClientAndroid(AwResource::GetConfigKeySystemUuidMapping()); | 101 return new AwMediaDrmBridgeClient( |
| 102 AwResource::GetConfigKeySystemUuidMapping()); |
102 } | 103 } |
103 | 104 |
104 } // namespace android_webview | 105 } // namespace android_webview |
OLD | NEW |