Reflect device status in geolocation permissions.request calls.

chrome/browser/geolocation/geolocation_permission_context_android.cc

 // Copyright 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/geolocation/geolocation_permission_context_android.h"
 
 #include <utility>
 #include <vector>
 
 #include "base/bind.h"
@@ skipping 139 matching lines @@
             &GeolocationPermissionContextAndroid::OnLocationSettingsDialogShown,
             weak_factory_.GetWeakPtr(), id, requesting_origin, embedding_origin,
             callback, persist, content_setting));
     return;
   }
 
   FinishNotifyPermissionSet(id, requesting_origin, embedding_origin, callback,
                             persist, content_setting);
 }
 
+PermissionResult
+GeolocationPermissionContextAndroid::UpdatePermissionStatusWithDeviceStatus(
+    PermissionResult result,
+    const GURL& requesting_origin,
+    const GURL& embedding_origin) const {
+  if (base::FeatureList::IsEnabled(features::kLsdPermissionPrompt) &&
+      result.content_setting != CONTENT_SETTING_BLOCK) {
+    if (!location_settings_->IsSystemLocationSettingEnabled()) {
+      // As this is returning the status for possible future permission
+      // requests, whose gesture status is unknown, pretend there is a user
+      // gesture here. If there is a possibility of PROMPT (i.e. if there is a
+      // user gesture attached to the later request) that should be returned,
+      // not BLOCK.
+      result.content_setting = CanShowLocationSettingsDialog(

[raymes, 2017/03/10 02:53:31]

Maybe we should update the result.status here, otherwise it may be confusing for
callers (although it's not used now). Same below. If you don't want to add extra
reasons right now, you could just return UNSPECIFIED.

[benwells, 2017/03/10 04:19:19]

Done.

+                                   requesting_origin, true /* user_gesture */)
+                                   ? CONTENT_SETTING_ASK
+                                   : CONTENT_SETTING_BLOCK;

[raymes, 2017/03/10 02:53:31]

nit: This might be slightly clearer in the expanded form:
if (CanShowLocationSettingsDialog(requesting_origin, true /* user_gesture */)
  result.content_setting = CONTENT_SETTING_ASK;
else
  result.content_setting = CONTENT_SETTING_BLOCK;

[benwells, 2017/03/10 04:19:19]

I've come to terms with the ternary operator, after years of avoiding it. But
.... Done.

+    }
+
+    if (result.content_setting != CONTENT_SETTING_BLOCK &&
+        !location_settings_->HasAndroidLocationPermission()) {
+      // TODO(benwells): plumb through the RFH and use the associated
+      // WebContents to check that the android location can be prompted for.
+      result.content_setting = CONTENT_SETTING_ASK;
+    }
+  }
+
+  return result;
+}
+
 bool GeolocationPermissionContextAndroid::IsLocationAccessPossible(
     content::WebContents* web_contents,
     const GURL& requesting_origin,
     bool user_gesture) {
   return (location_settings_->HasAndroidLocationPermission() ||
           location_settings_->CanPromptForAndroidLocationPermission(
               web_contents)) &&
          (location_settings_->IsSystemLocationSettingEnabled() ||
           CanShowLocationSettingsDialog(requesting_origin, user_gesture));
 }
 
 LocationSettingsDialogContext
 GeolocationPermissionContextAndroid::GetLocationSettingsDialogContext(
-    const GURL& requesting_origin) {
+    const GURL& requesting_origin) const {
   bool is_dse_origin = false;
   TemplateURLService* template_url_service =
       TemplateURLServiceFactory::GetForProfile(profile());
   if (template_url_service) {
     const TemplateURL* template_url =
         template_url_service->GetDefaultSearchProvider();
     if (template_url) {
       GURL search_url = template_url->GenerateSearchURL(
           template_url_service->search_terms_data());
       is_dse_origin = url::IsSameOriginWith(requesting_origin, search_url);
@@ skipping 14 matching lines @@
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
   ContentSetting new_setting = permissions_updated
       ? CONTENT_SETTING_ALLOW : CONTENT_SETTING_BLOCK;
 
   NotifyPermissionSet(id, requesting_frame_origin, embedding_origin, callback,
                       false /* persist */, new_setting);
 }
 
 bool GeolocationPermissionContextAndroid::CanShowLocationSettingsDialog(
     const GURL& requesting_origin,
-    bool user_gesture) {
+    bool user_gesture) const {
   if (!base::FeatureList::IsEnabled(features::kLsdPermissionPrompt))
     return false;
 
   // If this isn't the default search engine, a gesture is needed.
   if (GetLocationSettingsDialogContext(requesting_origin) == DEFAULT &&
       !user_gesture) {
     return false;
   }
 
   // TODO(benwells): Also check backoff for |requesting_origin|.
@@ skipping 44 matching lines @@
     // The tab helper can be null in tests.
     if (disclosure_helper)
       disclosure_helper->MaybeShowDisclosure(requesting_origin);
   }
 }
 
 void GeolocationPermissionContextAndroid::SetLocationSettingsForTesting(
     std::unique_ptr<LocationSettings> settings) {
   location_settings_ = std::move(settings);
 }