Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(37)

Side by Side Diff: chrome/browser/permissions/permission_context_base.cc

Issue 1551503002: Convert Pass()→std::move() in //chrome (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 12 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/permissions/permission_context_base.h" 5 #include "chrome/browser/permissions/permission_context_base.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 #include <utility>
8 9
9 #include "base/logging.h" 10 #include "base/logging.h"
10 #include "base/prefs/pref_service.h" 11 #include "base/prefs/pref_service.h"
11 #include "base/strings/stringprintf.h" 12 #include "base/strings/stringprintf.h"
12 #include "build/build_config.h" 13 #include "build/build_config.h"
13 #include "chrome/browser/content_settings/host_content_settings_map_factory.h" 14 #include "chrome/browser/content_settings/host_content_settings_map_factory.h"
14 #include "chrome/browser/permissions/permission_request_id.h" 15 #include "chrome/browser/permissions/permission_request_id.h"
15 #include "chrome/browser/permissions/permission_uma_util.h" 16 #include "chrome/browser/permissions/permission_uma_util.h"
16 #include "chrome/browser/permissions/permission_util.h" 17 #include "chrome/browser/permissions/permission_util.h"
17 #include "chrome/browser/profiles/profile.h" 18 #include "chrome/browser/profiles/profile.h"
(...skipping 169 matching lines...) Expand 10 before | Expand all | Expand 10 after
187 requesting_origin, user_gesture, permission_type_, 188 requesting_origin, user_gesture, permission_type_,
188 profile_->GetPrefs()->GetString(prefs::kAcceptLanguages), 189 profile_->GetPrefs()->GetString(prefs::kAcceptLanguages),
189 base::Bind(&PermissionContextBase::PermissionDecided, 190 base::Bind(&PermissionContextBase::PermissionDecided,
190 weak_factory_.GetWeakPtr(), id, requesting_origin, 191 weak_factory_.GetWeakPtr(), id, requesting_origin,
191 embedding_origin, callback), 192 embedding_origin, callback),
192 base::Bind(&PermissionContextBase::CleanUpBubble, 193 base::Bind(&PermissionContextBase::CleanUpBubble,
193 weak_factory_.GetWeakPtr(), id))); 194 weak_factory_.GetWeakPtr(), id)));
194 PermissionBubbleRequest* request = request_ptr.get(); 195 PermissionBubbleRequest* request = request_ptr.get();
195 196
196 bool inserted = 197 bool inserted =
197 pending_bubbles_.add(id.ToString(), request_ptr.Pass()).second; 198 pending_bubbles_.add(id.ToString(), std::move(request_ptr)).second;
198 DCHECK(inserted) << "Duplicate id " << id.ToString(); 199 DCHECK(inserted) << "Duplicate id " << id.ToString();
199 bubble_manager->AddRequest(request); 200 bubble_manager->AddRequest(request);
200 #else 201 #else
201 GetQueueController()->CreateInfoBarRequest( 202 GetQueueController()->CreateInfoBarRequest(
202 id, requesting_origin, embedding_origin, 203 id, requesting_origin, embedding_origin,
203 base::Bind(&PermissionContextBase::PermissionDecided, 204 base::Bind(&PermissionContextBase::PermissionDecided,
204 weak_factory_.GetWeakPtr(), id, requesting_origin, 205 weak_factory_.GetWeakPtr(), id, requesting_origin,
205 embedding_origin, callback, 206 embedding_origin, callback,
206 // the queue controller takes care of persisting the 207 // the queue controller takes care of persisting the
207 // permission 208 // permission
(...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after
291 content_settings_type_, std::string(), content_setting); 292 content_settings_type_, std::string(), content_setting);
292 } 293 }
293 294
294 bool PermissionContextBase::IsPermissionKillSwitchOn() const { 295 bool PermissionContextBase::IsPermissionKillSwitchOn() const {
295 const std::string param = variations::GetVariationParamValue( 296 const std::string param = variations::GetVariationParamValue(
296 kPermissionsKillSwitchFieldStudy, 297 kPermissionsKillSwitchFieldStudy,
297 PermissionUtil::GetPermissionString(permission_type_)); 298 PermissionUtil::GetPermissionString(permission_type_));
298 299
299 return param == kPermissionsKillSwitchBlockedValue; 300 return param == kPermissionsKillSwitchBlockedValue;
300 } 301 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698