chrome/browser/geolocation/chrome_geolocation_permission_context_android.h - 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/chrome_geolocation_permission_context_android.h

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/android/google_location_settings_helper.h ('K') | « chrome/browser/android/google_location_settings_helper_factory.cc ('k') | chrome/browser/geolocation/chrome_geolocation_permission_context_android.cc » ('j') | chrome/browser/geolocation/geolocation_confirm_infobar_delegate_android.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/geolocation/chrome_geolocation_permission_context_android.h

diff --git a/chrome/browser/geolocation/chrome_geolocation_permission_context_android.h b/chrome/browser/geolocation/chrome_geolocation_permission_context_android.h

index eb4dec8877988bdc8d4d03e65191347709f1a6b9..fa9dc2cd636fa7ba092f7c2e55d6a20fc53451a3 100644

--- a/chrome/browser/geolocation/chrome_geolocation_permission_context_android.h

+++ b/chrome/browser/geolocation/chrome_geolocation_permission_context_android.h

@@ -7,6 +7,7 @@

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

+class GoogleLocationSettingsHelper;

// Android-specific geolocation permission flow, taking into account the

// Google Location Settings, if available.

@@ -34,6 +35,8 @@ class ChromeGeolocationPermissionContextAndroid

bool allowed) OVERRIDE;

virtual GeolocationInfoBarQueueController* CreateQueueController() OVERRIDE;

+ scoped_ptr<GoogleLocationSettingsHelper> google_location_settings_helper_;

};

#endif // CHROME_BROWSER_GEOLOCATION_CHROME_GEOLOCATION_PERMISSION_CONTEXT_ANDROID_H_