content/shell/android/shell_apk/src/org/chromium/content_shell_apk/ContentShellActivity.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: content/shell/android/shell_apk/src/org/chromium/content_shell_apk/ContentShellActivity.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/testshell/java/src/org/chromium/chrome/testshell/ChromiumTestShellActivity.java ('k') | ui/android/java/src/org/chromium/ui/ActivityWindowAndroid.java » ('j') | ui/android/java/src/org/chromium/ui/WindowAndroid.java » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/shell/android/shell_apk/src/org/chromium/content_shell_apk/ContentShellActivity.java

diff --git a/content/shell/android/shell_apk/src/org/chromium/content_shell_apk/ContentShellActivity.java b/content/shell/android/shell_apk/src/org/chromium/content_shell_apk/ContentShellActivity.java

index ffbfc6dd890be4ca060a06875d2242a6e3959c3d..ddf549873df2bb7418cea3b3026b123351db62a2 100644

--- a/content/shell/android/shell_apk/src/org/chromium/content_shell_apk/ContentShellActivity.java

+++ b/content/shell/android/shell_apk/src/org/chromium/content_shell_apk/ContentShellActivity.java

@@ -5,7 +5,6 @@

package org.chromium.content_shell_apk;

import android.app.Activity;

-import android.content.Context;

import android.content.Intent;

import android.os.Bundle;

import android.text.TextUtils;

@@ -25,6 +24,7 @@ import org.chromium.content.common.CommandLine;

import org.chromium.content.common.ProcessInitException;

import org.chromium.content_shell.Shell;

import org.chromium.content_shell.ShellManager;

+import org.chromium.ui.ActivityWindowAndroid;

import org.chromium.ui.WindowAndroid;

/**

@@ -66,7 +66,7 @@ public class ContentShellActivity extends Activity {

setContentView(R.layout.content_shell_activity);

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

- mWindowAndroid = new WindowAndroid(this);

+ mWindowAndroid = new ActivityWindowAndroid(this);

mWindowAndroid.restoreInstanceState(savedInstanceState);

mShellManager.setWindow(mWindowAndroid);