chrome/android/java_sources.gni - Issue 2170123002: Reland: Add USB device permissions to individual site settings 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/android/java_sources.gni

Issue 2170123002: Reland: Add USB device permissions to individual site settings on Android. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Resolved merge conflict. Created 4 years, 5 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 | « chrome/android/java/strings/android_chrome_strings.grd ('k') | chrome/browser/android/preferences/website_preference_bridge.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/android/java_sources.gni

diff --git a/chrome/android/java_sources.gni b/chrome/android/java_sources.gni

index b7eca14ab50c094bba8081acd98201356bc0430b..49956971cab40b8a722435087cdfa42afa2c7683 100644

--- a/chrome/android/java_sources.gni

+++ b/chrome/android/java_sources.gni

@@ -745,6 +745,7 @@ chrome_java_sources = [

"java/src/org/chromium/chrome/browser/preferences/website/SiteSettingsPreferences.java",

"java/src/org/chromium/chrome/browser/preferences/website/StorageInfo.java",

"java/src/org/chromium/chrome/browser/preferences/website/TranslatePreferences.java",

+ "java/src/org/chromium/chrome/browser/preferences/website/UsbInfo.java",

"java/src/org/chromium/chrome/browser/preferences/website/Website.java",

"java/src/org/chromium/chrome/browser/preferences/website/WebsiteAddress.java",

"java/src/org/chromium/chrome/browser/preferences/website/WebsitePermissionsFetcher.java",