chrome/android/shell/java/src/org/chromium/chrome/shell/ChromeShellActivity.java - Issue 1164973003: 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: chrome/android/shell/java/src/org/chromium/chrome/shell/ChromeShellActivity.java

Issue 1164973003: Add initial support for runtime permissions in android M. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

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

« chrome/android/java/src/org/chromium/chrome/browser/infobar/ConfirmInfoBar.java ('K') | « chrome/android/java_staging/src/org/chromium/chrome/browser/omaha/UpdateInfoBarHelper.java ('k') | chrome/browser/content_settings/permission_infobar_delegate.h » ('j') | chrome/browser/content_settings/permission_infobar_delegate.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/android/shell/java/src/org/chromium/chrome/shell/ChromeShellActivity.java

diff --git a/chrome/android/shell/java/src/org/chromium/chrome/shell/ChromeShellActivity.java b/chrome/android/shell/java/src/org/chromium/chrome/shell/ChromeShellActivity.java

index 3b451ab474ece03149e3d484d2e414ffe32b1857..af15b564bea94ce79836687310a8df958179cbe1 100644

--- a/chrome/android/shell/java/src/org/chromium/chrome/shell/ChromeShellActivity.java

+++ b/chrome/android/shell/java/src/org/chromium/chrome/shell/ChromeShellActivity.java

@@ -88,7 +88,7 @@ public class ChromeShellActivity extends AppCompatActivity implements AppMenuPro

}

};

- private WindowAndroid mWindow;

+ private ActivityWindowAndroid mWindow;

private TabManager mTabManager;

private ChromeShellToolbar mToolbar;

private DevToolsServer mDevToolsServer;