content/shell/android/browsertests_apk/src/org/chromium/content_browsertests_apk/ContentBrowserTestsActivity.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: content/shell/android/browsertests_apk/src/org/chromium/content_browsertests_apk/ContentBrowserTestsActivity.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 | « content/public/android/java/src/org/chromium/content/browser/JellyBeanContentView.java ('k') | content/shell/android/java/src/org/chromium/content_shell/Shell.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/shell/android/browsertests_apk/src/org/chromium/content_browsertests_apk/ContentBrowserTestsActivity.java

diff --git a/content/shell/android/browsertests_apk/src/org/chromium/content_browsertests_apk/ContentBrowserTestsActivity.java b/content/shell/android/browsertests_apk/src/org/chromium/content_browsertests_apk/ContentBrowserTestsActivity.java

index 249baf637c3cfd60c96e87b240ac07451a2babcf..3f25e68e273e6d99ef420f097662453827c734a3 100644

--- a/content/shell/android/browsertests_apk/src/org/chromium/content_browsertests_apk/ContentBrowserTestsActivity.java

+++ b/content/shell/android/browsertests_apk/src/org/chromium/content_browsertests_apk/ContentBrowserTestsActivity.java

@@ -15,15 +15,15 @@ import org.chromium.base.JNINamespace;

import org.chromium.content.app.LibraryLoader;

import org.chromium.content.browser.AndroidBrowserProcess;

import org.chromium.content.common.ProcessInitException;

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

import org.chromium.content_shell.ShellManager;

+import org.chromium.ui.WindowAndroid;

@JNINamespace("content")

public class ContentBrowserTestsActivity extends Activity {

private static final String TAG = "ChromeBrowserTestsActivity";

private ShellManager mShellManager;

- private ActivityNativeWindow mActivityNativeWindow;

+ private WindowAndroid mWindowAndroid;

@Override

public void onCreate(Bundle savedInstanceState) {

@@ -40,8 +40,8 @@ public class ContentBrowserTestsActivity extends Activity {

(LayoutInflater) getSystemService(Context.LAYOUT_INFLATER_SERVICE);

View view = inflater.inflate(R.layout.test_activity, null);

mShellManager = (ShellManager) view.findViewById(R.id.shell_container);

- mActivityNativeWindow = new ActivityNativeWindow(this);

- mShellManager.setWindow(mActivityNativeWindow);

+ mWindowAndroid = new WindowAndroid(this);

+ mShellManager.setWindow(mWindowAndroid);

Log.i(TAG, "Running tests");

runTests();