content/shell/android/java/src/org/chromium/content_shell/ShellManager.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/java/src/org/chromium/content_shell/ShellManager.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/shell/android/java/src/org/chromium/content_shell/Shell.java ('k') | content/shell/android/shell_apk/src/org/chromium/content_shell_apk/ContentShellActivity.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/shell/android/java/src/org/chromium/content_shell/ShellManager.java

diff --git a/content/shell/android/java/src/org/chromium/content_shell/ShellManager.java b/content/shell/android/java/src/org/chromium/content_shell/ShellManager.java

index 7cf962d5f3798775b4c4ceaff4762fa100527f2c..b3fd95030188bc880b61776468b1f0add0407cbf 100644

--- a/content/shell/android/java/src/org/chromium/content_shell/ShellManager.java

+++ b/content/shell/android/java/src/org/chromium/content_shell/ShellManager.java

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

import org.chromium.base.JNINamespace;

import org.chromium.content.browser.ContentView;

import org.chromium.content.browser.ContentViewRenderView;

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

+import org.chromium.ui.WindowAndroid;

/**

* Container and generator of ShellViews.

@@ -23,7 +23,7 @@ public class ShellManager extends FrameLayout {

public static final String DEFAULT_SHELL_URL = "http://www.google.com";

private static boolean sStartup = true;

- private NativeWindow mWindow;

+ private WindowAndroid mWindow;

private Shell mActiveShell;

private String mStartupUrl = DEFAULT_SHELL_URL;

@@ -51,14 +51,14 @@ public class ShellManager extends FrameLayout {

/**

* @param window The window used to generate all shells.

- public void setWindow(NativeWindow window) {

+ public void setWindow(WindowAndroid window) {

mWindow = window;

}

/**

* @return The window used to generate all shells.

- public NativeWindow getWindow() {

+ public WindowAndroid getWindow() {

return mWindow;

}