chrome/android/java/src/org/chromium/chrome/browser/autofill/AutofillPopupGlue.java - Issue 14169011: [Android] Rename NativeWindow to WindowAndroid.

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: chrome/android/java/src/org/chromium/chrome/browser/autofill/AutofillPopupGlue.java

Issue 14169011: [Android] Rename NativeWindow to WindowAndroid. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Return Activity context for now Created 7 years, 8 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 | « chrome/android/java/src/org/chromium/chrome/browser/autofill/AutofillPopup.java ('k') | chrome/android/javatests/src/org/chromium/chrome/browser/autofill/AutofillTest.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/android/java/src/org/chromium/chrome/browser/autofill/AutofillPopupGlue.java

diff --git a/chrome/android/java/src/org/chromium/chrome/browser/autofill/AutofillPopupGlue.java b/chrome/android/java/src/org/chromium/chrome/browser/autofill/AutofillPopupGlue.java

index 34dca60c8e769915eedab1e453bc99d5a119ff41..d5c7af054e8ef4cf9f8752c91e9d6a24a3a1e353 100644

--- a/chrome/android/java/src/org/chromium/chrome/browser/autofill/AutofillPopupGlue.java

+++ b/chrome/android/java/src/org/chromium/chrome/browser/autofill/AutofillPopupGlue.java

@@ -8,7 +8,7 @@ import org.chromium.base.CalledByNative;

import org.chromium.base.JNINamespace;

import org.chromium.chrome.browser.autofill.AutofillPopup.AutofillPopupDelegate;

import org.chromium.content.browser.ContainerViewDelegate;

-import org.chromium.ui.gfx.NativeWindow;

+import org.chromium.ui.WindowAndroid;

/**

* JNI call glue for AutofillExternalDelagate C++ and Java objects.

@@ -18,15 +18,15 @@ public class AutofillPopupGlue implements AutofillPopupDelegate{

private final int mNativeAutofillPopup;

private final AutofillPopup mAutofillPopup;

- public AutofillPopupGlue(int nativeAutofillPopupViewAndroid, NativeWindow nativeWindow,

+ public AutofillPopupGlue(int nativeAutofillPopupViewAndroid, WindowAndroid nativeWindow,

ContainerViewDelegate containerViewDelegate) {

mNativeAutofillPopup = nativeAutofillPopupViewAndroid;

- mAutofillPopup = new AutofillPopup(nativeWindow, containerViewDelegate, this);

+ mAutofillPopup = new AutofillPopup(nativeWindow.getContext(), containerViewDelegate, this);

}

@CalledByNative

private static AutofillPopupGlue create(int nativeAutofillPopupViewAndroid,

- NativeWindow nativeWindow, ContainerViewDelegate containerViewDelegate) {

+ WindowAndroid nativeWindow, ContainerViewDelegate containerViewDelegate) {

return new AutofillPopupGlue(nativeAutofillPopupViewAndroid, nativeWindow,

containerViewDelegate);

}