chrome/chrome_browser.gypi - Issue 1332063003: permissions: implement coalesced permissions on 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: chrome/chrome_browser.gypi

Issue 1332063003: permissions: implement coalesced permissions on Android (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@request-multiple

Patch Set: Fix minor issues Created 5 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

« chrome/browser/ui/android/infobars/permission_group_infobar_android.cc ('K') | « chrome/browser/ui/android/infobars/permission_group_infobar_android.cc ('k') | chrome/chrome_browser_ui.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/chrome_browser.gypi

diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi

index 7642b203253155ad0eecd6697c7e4c4e64facd00..7af41bf39f87ea872a09430c4550ebfeea711faa 100644

--- a/chrome/chrome_browser.gypi

+++ b/chrome/chrome_browser.gypi

@@ -195,6 +195,8 @@

'browser/android/omnibox/omnibox_prerender.h',

'browser/android/password_ui_view_android.cc',

'browser/android/password_ui_view_android.h',

+ 'browser/android/permissions/permission_group_infobar_delegate_android.cc',

+ 'browser/android/permissions/permission_group_infobar_delegate_android.h',

'browser/android/popular_sites.cc',

'browser/android/popular_sites.h',

'browser/android/precache/precache_launcher.cc',

@@ -1826,6 +1828,7 @@

'android/java/src/org/chromium/chrome/browser/infobar/GeneratedPasswordSavedInfoBarDelegate.java',

'android/java/src/org/chromium/chrome/browser/infobar/InfoBar.java',

'android/java/src/org/chromium/chrome/browser/infobar/InfoBarContainer.java',

+ 'android/java/src/org/chromium/chrome/browser/infobar/PermissionGroupInfoBarAndroid.java',

'android/java/src/org/chromium/chrome/browser/infobar/PermissionUpdateInfoBarDelegate.java',

'android/java/src/org/chromium/chrome/browser/infobar/SavePasswordInfoBar.java',

'android/java/src/org/chromium/chrome/browser/invalidation/InvalidationServiceFactory.java',