chrome/android/testshell/java/src/org/chromium/chrome/testshell/ChromiumTestShellActivity.java - Issue 29303004: Make WindowAndroid constructor takes context as param.

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 29303004: Make WindowAndroid constructor takes context as param. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 7 years, 1 month 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') | content/shell/android/shell_apk/src/org/chromium/content_shell_apk/ContentShellActivity.java » ('j') | ui/android/java/src/org/chromium/ui/WindowAndroid.java » ('J')
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 2bc144c7fa60a136ee4e2ae5fdde69addea8855f..1e195cdbe26cd961dbd62b735cdff7274ba60b3e 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

@@ -24,9 +24,9 @@ import org.chromium.content.browser.ContentVideoViewClient;

import org.chromium.content.browser.ContentView;

import org.chromium.content.browser.ContentViewClient;

import org.chromium.content.browser.DeviceUtils;

-import org.chromium.content.browser.TracingControllerAndroid;

import org.chromium.content.common.CommandLine;

import org.chromium.sync.signin.ChromeSigninController;

+import org.chromium.ui.ActivityWindowAndroid;

import org.chromium.ui.WindowAndroid;

/**

@@ -78,7 +78,7 @@ public class ChromiumTestShellActivity extends Activity implements MenuHandler {

TestShellToolbar mToolbar = (TestShellToolbar) findViewById(R.id.toolbar);

mToolbar.setMenuHandler(this);

- mWindow = new WindowAndroid(this);

+ mWindow = new ActivityWindowAndroid(this);

mWindow.restoreInstanceState(savedInstanceState);

mTabManager.setWindow(mWindow);