ui/android/resources/resource_manager_impl.cc - Issue 1144333004: Make WebView work for external displays (over Presentations).

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: ui/android/resources/resource_manager_impl.cc

Issue 1144333004: Make WebView work for external displays (over Presentations). Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Minor fixes according to boliu/jdduke's comments Created 5 years, 5 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

« ui/android/java/src/org/chromium/ui/base/WindowAndroid.java ('K') | « ui/android/resources/resource_manager_impl.h ('k') | ui/android/resources/resource_manager_impl_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: ui/android/resources/resource_manager_impl.cc

diff --git a/ui/android/resources/resource_manager_impl.cc b/ui/android/resources/resource_manager_impl.cc

index c1c64ba26f8f114b34fc07fa99cd4dbfee7cc68e..ee40d5bd219240621d7021baca4d198a1c46f235 100644

--- a/ui/android/resources/resource_manager_impl.cc

+++ b/ui/android/resources/resource_manager_impl.cc

@@ -21,12 +21,13 @@ ResourceManagerImpl* ResourceManagerImpl::FromJavaObject(jobject jobj) {

}

ResourceManagerImpl::ResourceManagerImpl(

- ui::UIResourceProvider* ui_resource_provider)

+ ui::UIResourceProvider* ui_resource_provider,

+ jobject context)

: ui_resource_provider_(ui_resource_provider) {

JNIEnv* env = base::android::AttachCurrentThread();

- java_obj_.Reset(env, Java_ResourceManager_create(

- env, base::android::GetApplicationContext(),

- reinterpret_cast<intptr_t>(this)).obj());

+ java_obj_.Reset(

+ env, Java_ResourceManager_create(env, context,

+ reinterpret_cast<intptr_t>(this)).obj());

DCHECK(!java_obj_.is_null());

}