chrome/android/testshell/java/src/org/chromium/chrome/testshell/ChromiumTestShellActivity.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/testshell/java/src/org/chromium/chrome/testshell/ChromiumTestShellActivity.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/javatests/src/org/chromium/chrome/browser/input/SelectPopupOtherContentViewTest.java ('k') | chrome/android/testshell/java/src/org/chromium/chrome/testshell/TabManager.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/android/testshell/java/src/org/chromium/chrome/testshell/ChromiumTestShellActivity.java

diff --git a/chrome/android/testshell/java/src/org/chromium/chrome/testshell/ChromiumTestShellActivity.java b/chrome/android/testshell/java/src/org/chromium/chrome/testshell/ChromiumTestShellActivity.java

index 527a4edba384b290a5f89dbd5510fa77ddeba80f..25582462a18b24cc530176254ae0d58a4c32c48d 100644

--- a/chrome/android/testshell/java/src/org/chromium/chrome/testshell/ChromiumTestShellActivity.java

+++ b/chrome/android/testshell/java/src/org/chromium/chrome/testshell/ChromiumTestShellActivity.java

@@ -13,7 +13,6 @@ import android.view.KeyEvent;

import org.chromium.base.ChromiumActivity;

import org.chromium.chrome.browser.DevToolsServer;

-import org.chromium.content.app.LibraryLoader;

import org.chromium.content.browser.ActivityContentVideoViewDelegate;

import org.chromium.content.browser.AndroidBrowserProcess;

import org.chromium.content.browser.ContentVideoView;

@@ -21,7 +20,7 @@ import org.chromium.content.browser.ContentView;

import org.chromium.content.browser.DeviceUtils;

import org.chromium.content.common.CommandLine;

import org.chromium.content.common.ProcessInitException;

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

+import org.chromium.ui.WindowAndroid;

/**

* The {@link Activity} component of a basic test shell to test Chrome features.

@@ -31,7 +30,7 @@ public class ChromiumTestShellActivity extends ChromiumActivity {

private static final String COMMAND_LINE_FILE =

"/data/local/tmp/chromium-testshell-command-line";

- private ActivityNativeWindow mWindow;

+ private WindowAndroid mWindow;

private TabManager mTabManager;

private DevToolsServer mDevToolsServer;

@@ -56,7 +55,7 @@ public class ChromiumTestShellActivity extends ChromiumActivity {

mTabManager.setStartupUrl(startupUrl);

}

- mWindow = new ActivityNativeWindow(this);

+ mWindow = new WindowAndroid(this);

mWindow.restoreInstanceState(savedInstanceState);

mTabManager.setWindow(mWindow);