content/shell/android/shell_apk/src/org/chromium/content_shell_apk/ContentShellActivity.java - Issue 1169143003: Add initial support for runtime permissions in android M.

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 1169143003: Add initial support for runtime permissions in android M. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@2403

Patch Set: Created 5 years, 6 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/linker_test_apk/src/org/chromium/chromium_linker_test_apk/ChromiumLinkerTestActivity.java ('k') | ui/android/java/src/org/chromium/ui/base/ActivityWindowAndroid.java » ('j') | no next file with comments »
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 ea0c4e6586e438d23822fb7259617281130fdc05..a394a1b131f50c2c8319d099819b878dadac3223 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

@@ -28,7 +28,6 @@ import org.chromium.content_public.browser.WebContents;

import org.chromium.content_shell.Shell;

import org.chromium.content_shell.ShellManager;

import org.chromium.ui.base.ActivityWindowAndroid;

-import org.chromium.ui.base.WindowAndroid;

/**

* Activity for managing the Content Shell.

@@ -41,7 +40,7 @@ public class ContentShellActivity extends Activity {

public static final String COMMAND_LINE_ARGS_KEY = "commandLineArgs";

private ShellManager mShellManager;

- private WindowAndroid mWindowAndroid;

+ private ActivityWindowAndroid mWindowAndroid;

private Intent mLastSentIntent;

@Override