chrome/browser/geolocation/geolocation_infobar_queue_controller_android.cc - 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/browser/geolocation/geolocation_infobar_queue_controller_android.cc

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:

View side-by-side diff with in-line comments

Download patch

« chrome/browser/geolocation/geolocation_confirm_infobar_delegate_android.cc ('K') | « chrome/browser/geolocation/geolocation_infobar_queue_controller_android.h ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/geolocation/geolocation_infobar_queue_controller_android.cc

diff --git a/chrome/browser/geolocation/geolocation_infobar_queue_controller_android.cc b/chrome/browser/geolocation/geolocation_infobar_queue_controller_android.cc

index 16eacb4e0f7f047efaefd3d643c0f04c8a20e1fb..4794e77b0ce8d420ad44ec608abdbf9d0887e9c4 100644

--- a/chrome/browser/geolocation/geolocation_infobar_queue_controller_android.cc

+++ b/chrome/browser/geolocation/geolocation_infobar_queue_controller_android.cc

@@ -7,8 +7,10 @@

#include "chrome/browser/geolocation/geolocation_confirm_infobar_delegate_android.h"

GeolocationInfoBarQueueControllerAndroid::

-GeolocationInfoBarQueueControllerAndroid(Profile* profile)

- : GeolocationInfoBarQueueController(profile) {

+GeolocationInfoBarQueueControllerAndroid(Profile* profile,

+ GoogleLocationSettingsHelper* helper)

+ : GeolocationInfoBarQueueController(profile),

+ google_location_settings_helper_(helper) {

}

GeolocationConfirmInfoBarDelegate*

@@ -21,6 +23,7 @@ GeolocationInfoBarQueueControllerAndroid::CreateInfoBarDelegate(

const GURL& requesting_frame_url,

const std::string& display_languages) {

return new GeolocationConfirmInfoBarDelegateAndroid(

+ google_location_settings_helper_,

infobar_helper,

controller,

render_process_id,