Add a feature-controlled persistence checkbox to geolocation prompts on desktop Views platforms.

chrome/browser/permissions/permission_request_impl.cc

 // Copyright 2014 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_request_impl.h"
 
 #include "build/build_config.h"
 #include "chrome/browser/permissions/permission_decision_auto_blocker.h"
 #include "chrome/browser/permissions/permission_uma_util.h"
+#include "chrome/browser/permissions/permission_util.h"
 #include "chrome/grit/generated_resources.h"
 #include "components/url_formatter/elide_url.h"
 #include "grit/theme_resources.h"
 #include "net/base/escape.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/gfx/vector_icons_public.h"
 
 PermissionRequestImpl::PermissionRequestImpl(
     const GURL& request_origin,
     content::PermissionType permission_type,
@@ skipping 93 matching lines @@
   }
   return l10n_util::GetStringUTF16(message_id);
 }
 
 GURL PermissionRequestImpl::GetOrigin() const {
   return request_origin_;
 }
 
 void PermissionRequestImpl::PermissionGranted() {
   RegisterActionTaken();
-  permission_decided_callback_.Run(true, CONTENT_SETTING_ALLOW);
+  permission_decided_callback_.Run(persist(), CONTENT_SETTING_ALLOW);
 }
 
 void PermissionRequestImpl::PermissionDenied() {
   RegisterActionTaken();
-  permission_decided_callback_.Run(true, CONTENT_SETTING_BLOCK);
+  permission_decided_callback_.Run(persist(), CONTENT_SETTING_BLOCK);
 }
 
 void PermissionRequestImpl::Cancelled() {
   RegisterActionTaken();
   permission_decided_callback_.Run(false, CONTENT_SETTING_DEFAULT);
 }
 
 void PermissionRequestImpl::RequestFinished() {
   is_finished_ = true;
   delete_callback_.Run();
 }
 
+bool PermissionRequestImpl::ShouldShowPersistenceToggle() const {
+  return (permission_type_ == content::PermissionType::GEOLOCATION) &&
+         PermissionUtil::ShouldShowPersistenceToggle();
+}
+
 PermissionRequestType PermissionRequestImpl::GetPermissionRequestType()
     const {
   switch (permission_type_) {
     case content::PermissionType::GEOLOCATION:
       return PermissionRequestType::PERMISSION_GEOLOCATION;
 #if defined(ENABLE_NOTIFICATIONS)
     case content::PermissionType::NOTIFICATIONS:
       return PermissionRequestType::PERMISSION_NOTIFICATIONS;
 #endif
     case content::PermissionType::MIDI_SYSEX:
       return PermissionRequestType::PERMISSION_MIDI_SYSEX;
     case content::PermissionType::PUSH_MESSAGING:
       return PermissionRequestType::PERMISSION_PUSH_MESSAGING;
 #if defined(OS_CHROMEOS)
     case content::PermissionType::PROTECTED_MEDIA_IDENTIFIER:
       return PermissionRequestType::PERMISSION_PROTECTED_MEDIA_IDENTIFIER;
 #endif
     default:
       NOTREACHED();
       return PermissionRequestType::UNKNOWN;
   }
 }
 
 PermissionRequestGestureType PermissionRequestImpl::GetGestureType()
     const {
   return has_gesture_ ? PermissionRequestGestureType::GESTURE
                       : PermissionRequestGestureType::NO_GESTURE;
 }