| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "chrome/browser/geolocation/chrome_geolocation_permission_context_andro
id.h" | 5 #include "chrome/browser/geolocation/chrome_geolocation_permission_context_andro
id.h" |
| 6 | 6 |
| 7 #include "base/prefs/pref_service.h" | 7 #include "base/prefs/pref_service.h" |
| 8 #include "chrome/browser/android/google_location_settings_helper.h" | 8 #include "chrome/browser/android/google_location_settings_helper.h" |
| 9 #include "chrome/browser/profiles/profile.h" | 9 #include "chrome/browser/profiles/profile.h" |
| 10 #include "chrome/common/pref_names.h" | 10 #include "chrome/common/pref_names.h" |
| 11 #include "content/public/browser/browser_thread.h" | 11 #include "content/public/browser/browser_thread.h" |
| 12 #include "content/public/browser/web_contents.h" |
| 12 | 13 |
| 13 ChromeGeolocationPermissionContextAndroid:: | 14 ChromeGeolocationPermissionContextAndroid:: |
| 14 ChromeGeolocationPermissionContextAndroid(Profile* profile) | 15 ChromeGeolocationPermissionContextAndroid(Profile* profile) |
| 15 : ChromeGeolocationPermissionContext(profile), | 16 : ChromeGeolocationPermissionContext(profile), |
| 16 google_location_settings_helper_( | 17 google_location_settings_helper_( |
| 17 GoogleLocationSettingsHelper::Create()) { | 18 GoogleLocationSettingsHelper::Create()) { |
| 18 } | 19 } |
| 19 | 20 |
| 20 ChromeGeolocationPermissionContextAndroid:: | 21 ChromeGeolocationPermissionContextAndroid:: |
| 21 ~ChromeGeolocationPermissionContextAndroid() { | 22 ~ChromeGeolocationPermissionContextAndroid() { |
| 22 } | 23 } |
| 23 | 24 |
| 24 void ChromeGeolocationPermissionContextAndroid::DecidePermission( | 25 void ChromeGeolocationPermissionContextAndroid::DecidePermission( |
| 26 content::WebContents* web_contents, |
| 25 const PermissionRequestID& id, | 27 const PermissionRequestID& id, |
| 26 const GURL& requesting_frame, | 28 const GURL& requesting_frame, |
| 27 const GURL& embedder, | 29 const GURL& embedder, |
| 28 base::Callback<void(bool)> callback) { | 30 base::Callback<void(bool)> callback) { |
| 29 DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI)); | 31 DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI)); |
| 30 | 32 |
| 31 // Check to see if the feature in its entirety has been disabled. | 33 // Check to see if the feature in its entirety has been disabled. |
| 32 // This must happen before other services (e.g. tabs, extensions) | 34 // This must happen before other services (e.g. tabs, extensions) |
| 33 // get an opportunity to allow the geolocation request. | 35 // get an opportunity to allow the geolocation request. |
| 34 if (!google_location_settings_helper_->IsMasterLocationSettingEnabled()) { | 36 if (!google_location_settings_helper_->IsMasterLocationSettingEnabled()) { |
| 35 PermissionDecided(id, requesting_frame, embedder, callback, false); | 37 PermissionDecided(id, requesting_frame, embedder, callback, false); |
| 36 return; | 38 return; |
| 37 } | 39 } |
| 38 | 40 |
| 39 ChromeGeolocationPermissionContext::DecidePermission(id, requesting_frame, | 41 ChromeGeolocationPermissionContext::DecidePermission( |
| 40 embedder, callback); | 42 web_contents, id, requesting_frame, embedder, callback); |
| 41 } | 43 } |
| 42 | 44 |
| 43 void ChromeGeolocationPermissionContextAndroid::PermissionDecided( | 45 void ChromeGeolocationPermissionContextAndroid::PermissionDecided( |
| 44 const PermissionRequestID& id, | 46 const PermissionRequestID& id, |
| 45 const GURL& requesting_frame, | 47 const GURL& requesting_frame, |
| 46 const GURL& embedder, | 48 const GURL& embedder, |
| 47 base::Callback<void(bool)> callback, | 49 base::Callback<void(bool)> callback, |
| 48 bool allowed) { | 50 bool allowed) { |
| 49 DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI)); | 51 DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI)); |
| 50 // If Google Apps Location setting is turned off then we ignore | 52 // If Google Apps Location setting is turned off then we ignore |
| 51 // the 'allow' website setting for this site and instead show | 53 // the 'allow' website setting for this site and instead show |
| 52 // the infobar to go back to the 'settings' to turn it back on. | 54 // the infobar to go back to the 'settings' to turn it back on. |
| 53 if (allowed && | 55 if (allowed && |
| 54 !google_location_settings_helper_->IsGoogleAppsLocationSettingEnabled()) { | 56 !google_location_settings_helper_->IsGoogleAppsLocationSettingEnabled()) { |
| 55 QueueController()->CreateInfoBarRequest(id, requesting_frame, embedder, | 57 QueueController()->CreateInfoBarRequest(id, requesting_frame, embedder, |
| 56 callback); | 58 callback); |
| 57 return; | 59 return; |
| 58 } | 60 } |
| 59 | 61 |
| 60 ChromeGeolocationPermissionContext::PermissionDecided( | 62 ChromeGeolocationPermissionContext::PermissionDecided( |
| 61 id, requesting_frame, embedder, callback, allowed); | 63 id, requesting_frame, embedder, callback, allowed); |
| 62 } | 64 } |
| OLD | NEW |