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

Side by Side Diff: android_webview/lib/main/aw_main_delegate.cc

Issue 415043006: [Android WebView] AwMediaUrlInterceptor to handle media assets. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 6 years, 4 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 | Annotate | Revision Log
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 "android_webview/lib/main/aw_main_delegate.h" 5 #include "android_webview/lib/main/aw_main_delegate.h"
6 6
7 #include "android_webview/browser/aw_content_browser_client.h" 7 #include "android_webview/browser/aw_content_browser_client.h"
8 #include "android_webview/browser/browser_view_renderer.h" 8 #include "android_webview/browser/browser_view_renderer.h"
9 #include "android_webview/browser/gpu_memory_buffer_factory_impl.h" 9 #include "android_webview/browser/gpu_memory_buffer_factory_impl.h"
10 #include "android_webview/browser/scoped_allow_wait_for_legacy_web_view_api.h" 10 #include "android_webview/browser/scoped_allow_wait_for_legacy_web_view_api.h"
11 #include "android_webview/lib/aw_browser_dependency_factory_impl.h" 11 #include "android_webview/lib/aw_browser_dependency_factory_impl.h"
12 #include "android_webview/native/aw_media_url_interceptor.h"
12 #include "android_webview/native/aw_quota_manager_bridge_impl.h" 13 #include "android_webview/native/aw_quota_manager_bridge_impl.h"
13 #include "android_webview/native/aw_web_contents_view_delegate.h" 14 #include "android_webview/native/aw_web_contents_view_delegate.h"
14 #include "android_webview/native/aw_web_preferences_populater_impl.h" 15 #include "android_webview/native/aw_web_preferences_populater_impl.h"
15 #include "android_webview/native/external_video_surface_container_impl.h" 16 #include "android_webview/native/external_video_surface_container_impl.h"
16 #include "android_webview/renderer/aw_content_renderer_client.h" 17 #include "android_webview/renderer/aw_content_renderer_client.h"
17 #include "base/command_line.h" 18 #include "base/command_line.h"
18 #include "base/cpu.h" 19 #include "base/cpu.h"
19 #include "base/lazy_instance.h" 20 #include "base/lazy_instance.h"
20 #include "base/logging.h" 21 #include "base/logging.h"
21 #include "base/memory/scoped_ptr.h" 22 #include "base/memory/scoped_ptr.h"
22 #include "base/threading/thread_restrictions.h" 23 #include "base/threading/thread_restrictions.h"
24 #include "content/browser/media/android/browser_media_player_manager.h"
23 #include "content/public/browser/browser_main_runner.h" 25 #include "content/public/browser/browser_main_runner.h"
24 #include "content/public/browser/browser_thread.h" 26 #include "content/public/browser/browser_thread.h"
25 #include "content/public/common/content_switches.h" 27 #include "content/public/common/content_switches.h"
26 #include "gpu/command_buffer/client/gl_in_process_context.h" 28 #include "gpu/command_buffer/client/gl_in_process_context.h"
27 #include "media/base/media_switches.h" 29 #include "media/base/media_switches.h"
28 #include "webkit/common/gpu/webgraphicscontext3d_in_process_command_buffer_impl. h" 30 #include "webkit/common/gpu/webgraphicscontext3d_in_process_command_buffer_impl. h"
29 31
30 namespace android_webview { 32 namespace android_webview {
31 33
32 namespace { 34 namespace {
(...skipping 15 matching lines...) Expand all
48 bool AwMainDelegate::BasicStartupComplete(int* exit_code) { 50 bool AwMainDelegate::BasicStartupComplete(int* exit_code) {
49 content::SetContentClient(&content_client_); 51 content::SetContentClient(&content_client_);
50 52
51 CommandLine* cl = CommandLine::ForCurrentProcess(); 53 CommandLine* cl = CommandLine::ForCurrentProcess();
52 if (gpu_memory_buffer_factory_.get()->Initialize()) { 54 if (gpu_memory_buffer_factory_.get()->Initialize()) {
53 cl->AppendSwitch(switches::kEnableZeroCopy); 55 cl->AppendSwitch(switches::kEnableZeroCopy);
54 } else { 56 } else {
55 LOG(WARNING) << "Failed to initialize GpuMemoryBuffer factory"; 57 LOG(WARNING) << "Failed to initialize GpuMemoryBuffer factory";
56 } 58 }
57 59
60 content::BrowserMediaPlayerManager::RegisterMediaUrlInterceptor(
61 new AwMediaUrlInterceptor());
62
58 BrowserViewRenderer::CalculateTileMemoryPolicy(); 63 BrowserViewRenderer::CalculateTileMemoryPolicy();
59 64
60 cl->AppendSwitch(switches::kEnableBeginFrameScheduling); 65 cl->AppendSwitch(switches::kEnableBeginFrameScheduling);
61 cl->AppendSwitch(switches::kEnableImplSidePainting); 66 cl->AppendSwitch(switches::kEnableImplSidePainting);
62 67
63 // WebView uses the Android system's scrollbars and overscroll glow. 68 // WebView uses the Android system's scrollbars and overscroll glow.
64 cl->AppendSwitch(switches::kDisableOverscrollEdgeEffect); 69 cl->AppendSwitch(switches::kDisableOverscrollEdgeEffect);
65 70
66 // Not yet supported in single-process mode. 71 // Not yet supported in single-process mode.
67 cl->AppendSwitch(switches::kDisableSharedWorkers); 72 cl->AppendSwitch(switches::kDisableSharedWorkers);
(...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after
149 154
150 #if defined(VIDEO_HOLE) 155 #if defined(VIDEO_HOLE)
151 content::ExternalVideoSurfaceContainer* 156 content::ExternalVideoSurfaceContainer*
152 AwMainDelegate::CreateExternalVideoSurfaceContainer( 157 AwMainDelegate::CreateExternalVideoSurfaceContainer(
153 content::WebContents* web_contents) { 158 content::WebContents* web_contents) {
154 return new ExternalVideoSurfaceContainerImpl(web_contents); 159 return new ExternalVideoSurfaceContainerImpl(web_contents);
155 } 160 }
156 #endif 161 #endif
157 162
158 } // namespace android_webview 163 } // namespace android_webview
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698