summaryrefslogtreecommitdiffstats
path: root/chrome/browser/android/mock_location_settings.cc
diff options
context:
space:
mode:
authortedchoc <tedchoc@chromium.org>2015-06-25 10:28:00 -0700
committerCommit bot <commit-bot@chromium.org>2015-06-25 17:28:53 +0000
commitc346106e1bb0760e297e2b6ce16720c0095e9d73 (patch)
tree42056ada8d4902b8c72eb3234a1f310e7063c3af /chrome/browser/android/mock_location_settings.cc
parent5b4ba92dad3dd839774db650eb7ec61a799f46c6 (diff)
downloadchromium_src-c346106e1bb0760e297e2b6ce16720c0095e9d73.zip
chromium_src-c346106e1bb0760e297e2b6ce16720c0095e9d73.tar.gz
chromium_src-c346106e1bb0760e297e2b6ce16720c0095e9d73.tar.bz2
Add the ability to determine whether Chrome can possibly request an Android permission.
TBR=mvanouwerkerk BUG=503392 Review URL: https://codereview.chromium.org/1207743003 Cr-Commit-Position: refs/heads/master@{#336189}
Diffstat (limited to 'chrome/browser/android/mock_location_settings.cc')
-rw-r--r--chrome/browser/android/mock_location_settings.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/chrome/browser/android/mock_location_settings.cc b/chrome/browser/android/mock_location_settings.cc
index 32955ae..350306f 100644
--- a/chrome/browser/android/mock_location_settings.cc
+++ b/chrome/browser/android/mock_location_settings.cc
@@ -27,7 +27,8 @@ bool MockLocationSettings::IsMasterLocationSettingEnabled() {
return master_location_enabled;
}
-bool MockLocationSettings::IsLocationEnabled() {
+bool MockLocationSettings::CanSitesRequestLocationPermission(
+ content::WebContents* web_contents) {
return IsMasterLocationSettingEnabled() &&
IsGoogleAppsLocationSettingEnabled();
}