chrome/browser/geolocation/geolocation_permission_context_android.h - Issue 815343005: Clean up geolocation code now that it's all upstream.

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_permission_context_android.h

Issue 815343005: Clean up geolocation code now that it's all upstream. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: renamed IsSystemLocationEnabled -> IsLocationEnabled 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:

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

Download patch

« no previous file with comments | « chrome/browser/android/mock_location_settings.cc ('k') | chrome/browser/geolocation/geolocation_permission_context_android.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/geolocation/geolocation_permission_context_android.h

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

index 73c6cbdc4fd77a19f9989c684b33731d723c4ebd..db24bfbe2d1cf1ff7322c05c8ca44ae4725932d5 100644

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

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

@@ -27,7 +27,7 @@ namespace content {

class WebContents;

}

-class GoogleLocationSettingsHelper;

+class LocationSettings;

class GURL;

class PermissionRequestID;

@@ -48,12 +48,11 @@ class GeolocationPermissionContextAndroid

bool user_gesture,

const BrowserPermissionCallback& callback) override;

- // Overrides the GoogleLocationSettingsHelper used to determine whether

+ // Overrides the LocationSettings object used to determine whether

// system and Chrome-wide location permissions are enabled.

- void SetGoogleLocationSettingsHelperForTesting(

- scoped_ptr<GoogleLocationSettingsHelper> helper);

+ void SetLocationSettingsForTesting(scoped_ptr<LocationSettings> settings);

- scoped_ptr<GoogleLocationSettingsHelper> google_location_settings_helper_;

+ scoped_ptr<LocationSettings> location_settings_;

DISALLOW_COPY_AND_ASSIGN(GeolocationPermissionContextAndroid);

};