Reflect device status in geolocation permissions.request calls.

chrome/browser/permissions/permission_manager.cc

 // Copyright 2015 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/permissions/permission_manager.h"
 
 #include <memory>
 #include <utility>
 
 #include "base/callback.h"
@@ skipping 422 matching lines @@
 
   context->ResetPermission(requesting_origin.GetOrigin(),
                            embedding_origin.GetOrigin());
 }
 
 PermissionStatus PermissionManager::GetPermissionStatus(
     PermissionType permission,
     const GURL& requesting_origin,
     const GURL& embedding_origin) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
-  return ContentSettingToPermissionStatus(
+  PermissionResult result =
       GetPermissionStatus(PermissionTypeToContentSetting(permission),
-                          requesting_origin, embedding_origin)
-          .content_setting);
+                          requesting_origin, embedding_origin);
+
+  // TODO(benwells): split this into two functions, GetPermissionStatus and
+  // GetPermissionStatusForPermissionsAPI.

[raymes, 2017/03/10 04:37:13]

One thought I had is that we may just want to leave the content-API as-is and
include the device status in it and instead just change the Chrome-API to
GetPermissionStatusNoDeviceStatus or something. Anyway not important for this
CL.

+  PermissionContextBase* context =
+      GetPermissionContext(PermissionTypeToContentSetting(permission));
+  if (context) {
+    result = context->UpdatePermissionStatusWithDeviceStatus(
+        result, requesting_origin, embedding_origin);
+  }
+
+  return ContentSettingToPermissionStatus(result.content_setting);
 }
 
 int PermissionManager::SubscribePermissionStatusChange(
     PermissionType permission,
     const GURL& requesting_origin,
     const GURL& embedding_origin,
     const base::Callback<void(PermissionStatus)>& callback) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
   if (subscriptions_.IsEmpty())
     HostContentSettingsMapFactory::GetForProfile(profile_)->AddObserver(this);
@@ skipping 81 matching lines @@
   }
   PermissionContextBase* context = GetPermissionContext(permission);
   PermissionResult result = context->GetPermissionStatus(
       nullptr /* render_frame_host */, requesting_origin.GetOrigin(),
       embedding_origin.GetOrigin());
   DCHECK(result.content_setting == CONTENT_SETTING_ALLOW ||
          result.content_setting == CONTENT_SETTING_ASK ||
          result.content_setting == CONTENT_SETTING_BLOCK);
   return result;
 }