content/shell/android/java/src/org/chromium/content_shell/ContentShellActivity.java - Issue 10916160: Upstreaming SelectFileDialog for Android

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/ContentShellActivity.java

Issue 10916160: Upstreaming SelectFileDialog for Android (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 8 years, 3 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/browser/android/content_view_core.h ('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/java/src/org/chromium/content_shell/ContentShellActivity.java

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

index 8542a41cbae89a648352833ab259ca84e79c8a6e..2edf7a2443a95f759783fd816a430bcb7df742ee 100644

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

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

@@ -15,6 +15,7 @@ import org.chromium.content.app.AppResource;

import org.chromium.content.app.LibraryLoader;

import org.chromium.content.browser.ContentView;

import org.chromium.content.common.CommandLine;

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

/**

* Activity for managing the Content Shell.

@@ -42,6 +43,7 @@ public class ContentShellActivity extends Activity {

setContentView(R.layout.content_shell_activity);

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

+ mShellManager.setWindow(new NativeWindow(this));

String startupUrl = getUrlFromIntent(getIntent());

if (!TextUtils.isEmpty(startupUrl)) {