android_webview/lib/main/aw_main_delegate.cc - Issue 1123993002: Componentizes external_video_surface to reduce webview/Cast duplication.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: android_webview/lib/main/aw_main_delegate.cc

Issue 1123993002: Componentizes external_video_surface to reduce webview/Cast duplication. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: java DEPS, round 2 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « android_webview/javatests/src/org/chromium/android_webview/test/util/VideoSurfaceViewUtils.java ('k') | android_webview/lib/main/webview_jni_onload.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: android_webview/lib/main/aw_main_delegate.cc

diff --git a/android_webview/lib/main/aw_main_delegate.cc b/android_webview/lib/main/aw_main_delegate.cc

index 852081619f39e60952835d7157d8a053060609e0..d9cbab894a92f23ccad759f53f18d84dc4bf68ed 100644

--- a/android_webview/lib/main/aw_main_delegate.cc

+++ b/android_webview/lib/main/aw_main_delegate.cc

@@ -14,7 +14,6 @@

#include "android_webview/native/aw_quota_manager_bridge_impl.h"

#include "android_webview/native/aw_web_contents_view_delegate.h"

#include "android_webview/native/aw_web_preferences_populater_impl.h"

-#include "android_webview/native/external_video_surface_container_impl.h"

#include "android_webview/native/public/aw_assets.h"

#include "android_webview/renderer/aw_content_renderer_client.h"

#include "base/command_line.h"

@@ -25,6 +24,7 @@

#include "base/memory/scoped_ptr.h"

#include "base/threading/thread_restrictions.h"

#include "cc/base/switches.h"

+#include "components/external_video_surface/browser/android/external_video_surface_container_impl.h"

#include "content/public/browser/android/browser_media_player_manager.h"

#include "content/public/browser/browser_main_runner.h"

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

@@ -195,7 +195,8 @@ AwMessagePortService* AwMainDelegate::CreateAwMessagePortService() {

content::ExternalVideoSurfaceContainer*

AwMainDelegate::CreateExternalVideoSurfaceContainer(

content::WebContents* web_contents) {

- return ExternalVideoSurfaceContainerImpl::Create(web_contents);

+ return external_video_surface::ExternalVideoSurfaceContainerImpl::Create(

+ web_contents);

}

#endif