components/web_contents_delegate_android/color_chooser_android.cc - Issue 639703004: Optimizing DateTimeAndroid and ColorChooserAndroid initializations.

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: components/web_contents_delegate_android/color_chooser_android.cc

Issue 639703004: Optimizing DateTimeAndroid and ColorChooserAndroid initializations. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fixed nits. Created 6 years, 2 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

« components/web_contents_delegate_android/android/java/src/org/chromium/components/web_contents_delegate_android/ColorChooserAndroid.java ('K') | « components/web_contents_delegate_android/android/java/src/org/chromium/components/web_contents_delegate_android/ColorChooserAndroid.java ('k') | content/browser/android/date_time_chooser_android.h » ('j') | content/browser/android/date_time_chooser_android.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: components/web_contents_delegate_android/color_chooser_android.cc

diff --git a/components/web_contents_delegate_android/color_chooser_android.cc b/components/web_contents_delegate_android/color_chooser_android.cc

index d946fa9364aa23d07f11b22c3adc8da32e7e3c6b..52d139ed96884c100c172278eb19abaab275bca5 100644

--- a/components/web_contents_delegate_android/color_chooser_android.cc

+++ b/components/web_contents_delegate_android/color_chooser_android.cc

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

#include "base/android/jni_array.h"

#include "base/android/jni_string.h"

-#include "content/public/browser/android/content_view_core.h"

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

#include "content/public/common/color_suggestion.h"

#include "jni/ColorChooserAndroid_jni.h"

@@ -21,9 +20,6 @@ ColorChooserAndroid::ColorChooserAndroid(

const std::vector<content::ColorSuggestion>& suggestions)

: web_contents_(web_contents) {

JNIEnv* env = AttachCurrentThread();

- content::ContentViewCore* content_view_core =

- content::ContentViewCore::FromWebContents(web_contents);

- DCHECK(content_view_core);

ScopedJavaLocalRef<jobjectArray> suggestions_array;

@@ -46,7 +42,7 @@ ColorChooserAndroid::ColorChooserAndroid(

j_color_chooser_.Reset(Java_ColorChooserAndroid_createColorChooserAndroid(

env,

reinterpret_cast<intptr_t>(this),

- content_view_core->GetJavaObject().obj(),

+ web_contents->GetJavaWebContents().obj(),

initial_color,

suggestions_array.obj()));

}