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

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:

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

Download patch

Index: chrome/browser/geolocation/geolocation_permission_context_android.cc

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

index f02c841cabb6ae6228c91f82ee0d5558dcd8d1be..0594d27f0e495bf7c51c2119dae6c3ef20f84997 100644

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

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

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

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

#include "base/prefs/pref_service.h"

+#include "chrome/browser/android/app_google_location_settings_helper.h"

#include "chrome/browser/android/google_location_settings_helper.h"

#include "chrome/browser/profiles/profile.h"

#include "content/public/browser/browser_thread.h"

@@ -19,8 +20,7 @@ PermissionRequestInfo::PermissionRequestInfo()

GeolocationPermissionContextAndroid::

GeolocationPermissionContextAndroid(Profile* profile)

: GeolocationPermissionContext(profile),

- google_location_settings_helper_(

- GoogleLocationSettingsHelper::Create()),

+ google_location_settings_helper_(new AppGoogleLocationSettingsHelper()),

weak_factory_(this) {

}

« no previous file with comments | « chrome/browser/android/preferences/website_preference_bridge.cc ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »