chrome/chrome_browser.gypi - Issue 850813002: Upstream Site Settings.

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 850813002: Upstream Site Settings. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@location_settings_singleton

Patch Set: use findbugs annotations; fix test Created 5 years, 11 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:

Index: chrome/chrome_browser.gypi

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

index f267c3ddbc923c2f7603c4101156fe839378b04e..7c4e967d849a500307ab8e5e2a1aaa4f890893b0 100644

--- a/chrome/chrome_browser.gypi

+++ b/chrome/chrome_browser.gypi

@@ -27,6 +27,8 @@

'browser/android/activity_type_id_list.h',

'browser/android/activity_type_ids.cc',

'browser/android/activity_type_ids.h',

+ 'browser/android/app_google_location_settings_helper.cc',

+ 'browser/android/app_google_location_settings_helper.h',

'browser/android/appmenu/app_menu_drag_helper.cc',

'browser/android/appmenu/app_menu_drag_helper.h',

'browser/android/banners/app_banner_manager.cc',

@@ -119,6 +121,8 @@

'browser/android/password_ui_view_android.h',

'browser/android/preferences/pref_service_bridge.cc',

'browser/android/preferences/pref_service_bridge.h',

+ 'browser/android/preferences/website_preference_bridge.cc',

+ 'browser/android/preferences/website_preference_bridge.h',

'browser/android/profiles/profile_downloader_android.cc',

'browser/android/profiles/profile_downloader_android.h',

'browser/android/provider/blocking_ui_thread_async_request.cc',

@@ -1589,7 +1593,9 @@

'android/java/src/org/chromium/chrome/browser/partnerbookmarks/PartnerBookmarksReader.java',

'android/java/src/org/chromium/chrome/browser/password_manager/PasswordAuthenticationManager.java',

'android/java/src/org/chromium/chrome/browser/PasswordUIView.java',

+ 'android/java/src/org/chromium/chrome/browser/preferences/LocationSettings.java',

'android/java/src/org/chromium/chrome/browser/preferences/PrefServiceBridge.java',

+ 'android/java/src/org/chromium/chrome/browser/preferences/website/WebsitePreferenceBridge.java',

'android/java/src/org/chromium/chrome/browser/profiles/MostVisitedSites.java',

'android/java/src/org/chromium/chrome/browser/profiles/Profile.java',

'android/java/src/org/chromium/chrome/browser/profiles/ProfileDownloader.java',