components/web_contents_delegate_android/android/java/src/org/chromium/components/web_contents_delegate_android/ColorChooserAndroid.java - Issue 1528733002: Pull the Activity context from WindowAndroid if possible

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/android/java/src/org/chromium/components/web_contents_delegate_android/ColorChooserAndroid.java

Issue 1528733002: Pull the Activity context from WindowAndroid if possible (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Changed AwContents logic and moved the static call to WindowAndroid Created 5 years 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/java/src/org/chromium/android_webview/AwContents.java ('k') | content/public/android/java/src/org/chromium/content/browser/ContentVideoView.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: components/web_contents_delegate_android/android/java/src/org/chromium/components/web_contents_delegate_android/ColorChooserAndroid.java

diff --git a/components/web_contents_delegate_android/android/java/src/org/chromium/components/web_contents_delegate_android/ColorChooserAndroid.java b/components/web_contents_delegate_android/android/java/src/org/chromium/components/web_contents_delegate_android/ColorChooserAndroid.java

index 207fee2dd4335ec8cc21f94117115fbd341944e1..25f5f62fd1896098f86f740adab9858905b5bd6e 100644

--- a/components/web_contents_delegate_android/android/java/src/org/chromium/components/web_contents_delegate_android/ColorChooserAndroid.java

+++ b/components/web_contents_delegate_android/android/java/src/org/chromium/components/web_contents_delegate_android/ColorChooserAndroid.java

@@ -12,6 +12,7 @@ import org.chromium.content.browser.ContentViewCore;

import org.chromium.ui.ColorPickerDialog;

import org.chromium.ui.ColorSuggestion;

import org.chromium.ui.OnColorChangedListener;

+import org.chromium.ui.base.WindowAndroid;

/**

* ColorChooserAndroid communicates with the java ColorPickerDialog and the

@@ -51,8 +52,11 @@ public class ColorChooserAndroid {

ContentViewCore contentViewCore,

int initialColor,

ColorSuggestion[] suggestions) {

+ if (contentViewCore.getWindowAndroid() == null) return null;

+ Context windowContext = contentViewCore.getWindowAndroid().getContext().get();

+ if (WindowAndroid.activityFromContext(windowContext) == null) return null;

ColorChooserAndroid chooser = new ColorChooserAndroid(nativeColorChooserAndroid,

- contentViewCore.getContext(), initialColor, suggestions);

+ windowContext, initialColor, suggestions);

chooser.openColorChooser();

return chooser;

}