chrome/chrome_browser.gypi - Issue 11186010: Update geolocation infobar to handle Android system 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 11186010: Update geolocation infobar to handle Android system settings (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Fix conflict Created 8 years, 2 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 3bd5dab643bd5aab41ad1fdcd2c60c141b5693d5..8612842a31650b35d3f79c97a8b12d308c9e37e8 100644

--- a/chrome/chrome_browser.gypi

+++ b/chrome/chrome_browser.gypi

@@ -123,6 +123,10 @@

'browser/android/content_view_util.h',

'browser/android/devtools_server.cc',

'browser/android/devtools_server.h',

+ 'browser/android/google_location_settings_helper.cc',

+ 'browser/android/google_location_settings_helper.h',

+ 'browser/android/google_location_settings_helper_factory.cc',

+ 'browser/android/google_location_settings_helper_factory.h',

'browser/android/intent_helper.cc',

'browser/android/intent_helper.h',

'browser/android/process_utils.cc',

@@ -2855,6 +2859,8 @@

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

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

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

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

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

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

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

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