android_webview/browser/aw_content_browser_client.cc - Issue 962793005: Adds MediaClientAndroid to support embedder/MediaDrmBridge interaction.

Side by Side Diff: android_webview/browser/aw_content_browser_client.cc

Issue 962793005: Adds MediaClientAndroid to support embedder/MediaDrmBridge interaction. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: added components/cdm OWNERS to components/cdm.gypi (per-file) Created 5 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

« android_webview/browser/aw_browser_main_parts.cc ('K') | « android_webview/browser/aw_browser_main_parts.cc ('k') | android_webview/browser/aw_media_client_android.h » ('j') | android_webview/browser/aw_media_client_android.cc » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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/browser/aw_content_browser_client.h"	5 #include "android_webview/browser/aw_content_browser_client.h"

6	6

7 #include "android_webview/browser/aw_browser_context.h"	7 #include "android_webview/browser/aw_browser_context.h"

8 #include "android_webview/browser/aw_browser_main_parts.h"	8 #include "android_webview/browser/aw_browser_main_parts.h"

9 #include "android_webview/browser/aw_contents_client_bridge_base.h"	9 #include "android_webview/browser/aw_contents_client_bridge_base.h"

10 #include "android_webview/browser/aw_contents_io_thread_client.h"	10 #include "android_webview/browser/aw_contents_io_thread_client.h"

11 #include "android_webview/browser/aw_cookie_access_policy.h"	11 #include "android_webview/browser/aw_cookie_access_policy.h"

12 #include "android_webview/browser/aw_dev_tools_manager_delegate.h"	12 #include "android_webview/browser/aw_dev_tools_manager_delegate.h"

13 #include "android_webview/browser/aw_printing_message_filter.h"	13 #include "android_webview/browser/aw_printing_message_filter.h"

14 #include "android_webview/browser/aw_quota_permission_context.h"	14 #include "android_webview/browser/aw_quota_permission_context.h"

15 #include "android_webview/browser/aw_web_preferences_populater.h"	15 #include "android_webview/browser/aw_web_preferences_populater.h"

16 #include "android_webview/browser/jni_dependency_factory.h"	16 #include "android_webview/browser/jni_dependency_factory.h"

17 #include "android_webview/browser/net/aw_url_request_context_getter.h"	17 #include "android_webview/browser/net/aw_url_request_context_getter.h"

18 #include "android_webview/browser/net_disk_cache_remover.h"	18 #include "android_webview/browser/net_disk_cache_remover.h"

19 #include "android_webview/browser/renderer_host/aw_resource_dispatcher_host_dele gate.h"	19 #include "android_webview/browser/renderer_host/aw_resource_dispatcher_host_dele gate.h"

20 #include "android_webview/common/render_view_messages.h"	20 #include "android_webview/common/render_view_messages.h"

21 #include "android_webview/common/url_constants.h"	21 #include "android_webview/common/url_constants.h"

22 #include "base/android/locale_utils.h"	22 #include "base/android/locale_utils.h"

23 #include "base/base_paths_android.h"	23 #include "base/base_paths_android.h"

24 #include "base/path_service.h"	24 #include "base/path_service.h"

25 #include "components/cdm/browser/cdm_message_filter_android.h"	25 #include "components/cdm/browser/cdm_message_filter_android.h"

	26 #include "components/cdm/browser/widevine_drm_delegate_android.h"
	boliu 2015/04/29 19:24:25 spurious change not needed? spurious change not needed? gunsch 2015/04/29 20:29:43 Done. Show quoted text On 2015/04/29 19:24:25, boliu wrote: > spurious change not needed? Done.
26 #include "content/public/browser/access_token_store.h"	27 #include "content/public/browser/access_token_store.h"

27 #include "content/public/browser/browser_message_filter.h"	28 #include "content/public/browser/browser_message_filter.h"

28 #include "content/public/browser/browser_thread.h"	29 #include "content/public/browser/browser_thread.h"

29 #include "content/public/browser/child_process_security_policy.h"	30 #include "content/public/browser/child_process_security_policy.h"

30 #include "content/public/browser/client_certificate_delegate.h"	31 #include "content/public/browser/client_certificate_delegate.h"

31 #include "content/public/browser/render_frame_host.h"	32 #include "content/public/browser/render_frame_host.h"

32 #include "content/public/browser/render_process_host.h"	33 #include "content/public/browser/render_process_host.h"

33 #include "content/public/browser/render_view_host.h"	34 #include "content/public/browser/render_view_host.h"

34 #include "content/public/browser/web_contents.h"	35 #include "content/public/browser/web_contents.h"

35 #include "content/public/common/url_constants.h"	36 #include "content/public/common/url_constants.h"

(...skipping 436 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
472 return native_factory_->CreateExternalVideoSurfaceContainer(web_contents);	473 return native_factory_->CreateExternalVideoSurfaceContainer(web_contents);

473 }	474 }

474 #endif	475 #endif

475	476

476 content::DevToolsManagerDelegate*	477 content::DevToolsManagerDelegate*

477 AwContentBrowserClient::GetDevToolsManagerDelegate() {	478 AwContentBrowserClient::GetDevToolsManagerDelegate() {

478 return new AwDevToolsManagerDelegate();	479 return new AwDevToolsManagerDelegate();

479 }	480 }

480	481

481 } // namespace android_webview	482 } // namespace android_webview

OLD	NEW