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

Side by Side Diff: chrome/browser/media_galleries/media_galleries_permission_controller.cc

Issue 2230203002: chrome: Use stl utilities from the base namespace (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Removed accidental components/ change Created 4 years, 4 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/media_galleries/media_galleries_permission_controller.h " 5 #include "chrome/browser/media_galleries/media_galleries_permission_controller.h "
6 6
7 #include "base/base_paths.h" 7 #include "base/base_paths.h"
8 #include "base/path_service.h" 8 #include "base/path_service.h"
9 #include "base/stl_util.h" 9 #include "base/stl_util.h"
10 #include "base/strings/utf_string_conversions.h" 10 #include "base/strings/utf_string_conversions.h"
(...skipping 161 matching lines...) Expand 10 before | Expand all | Expand 10 after
172 // Note: sorts by display criterion: GalleriesVectorComparator. 172 // Note: sorts by display criterion: GalleriesVectorComparator.
173 MediaGalleriesDialogController::Entries 173 MediaGalleriesDialogController::Entries
174 MediaGalleriesPermissionController::GetSectionEntries(size_t index) const { 174 MediaGalleriesPermissionController::GetSectionEntries(size_t index) const {
175 DCHECK_GT(2U, index); // This dialog only has two sections. 175 DCHECK_GT(2U, index); // This dialog only has two sections.
176 176
177 bool existing = !index; 177 bool existing = !index;
178 MediaGalleriesDialogController::Entries result; 178 MediaGalleriesDialogController::Entries result;
179 for (GalleryPermissionsMap::const_iterator iter = known_galleries_.begin(); 179 for (GalleryPermissionsMap::const_iterator iter = known_galleries_.begin();
180 iter != known_galleries_.end(); ++iter) { 180 iter != known_galleries_.end(); ++iter) {
181 MediaGalleryPrefId pref_id = GetPrefId(iter->first); 181 MediaGalleryPrefId pref_id = GetPrefId(iter->first);
182 if (!ContainsKey(forgotten_galleries_, iter->first) && 182 if (!base::ContainsKey(forgotten_galleries_, iter->first) &&
183 existing == ContainsKey(pref_permitted_galleries_, pref_id)) { 183 existing == base::ContainsKey(pref_permitted_galleries_, pref_id)) {
184 result.push_back(iter->second); 184 result.push_back(iter->second);
185 } 185 }
186 } 186 }
187 if (existing) { 187 if (existing) {
188 for (GalleryPermissionsMap::const_iterator iter = new_galleries_.begin(); 188 for (GalleryPermissionsMap::const_iterator iter = new_galleries_.begin();
189 iter != new_galleries_.end(); ++iter) { 189 iter != new_galleries_.end(); ++iter) {
190 result.push_back(iter->second); 190 result.push_back(iter->second);
191 } 191 }
192 } 192 }
193 193
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
239 239
240 // Don't sort -- the dialog is open, and we don't want to adjust any 240 // Don't sort -- the dialog is open, and we don't want to adjust any
241 // positions for future updates to the dialog contents until they are 241 // positions for future updates to the dialog contents until they are
242 // redrawn. 242 // redrawn.
243 } 243 }
244 244
245 void MediaGalleriesPermissionController::DidForgetEntry( 245 void MediaGalleriesPermissionController::DidForgetEntry(
246 GalleryDialogId gallery_id) { 246 GalleryDialogId gallery_id) {
247 media_galleries::UsageCount(media_galleries::DIALOG_FORGET_GALLERY); 247 media_galleries::UsageCount(media_galleries::DIALOG_FORGET_GALLERY);
248 if (!new_galleries_.erase(gallery_id)) { 248 if (!new_galleries_.erase(gallery_id)) {
249 DCHECK(ContainsKey(known_galleries_, gallery_id)); 249 DCHECK(base::ContainsKey(known_galleries_, gallery_id));
250 forgotten_galleries_.insert(gallery_id); 250 forgotten_galleries_.insert(gallery_id);
251 } 251 }
252 dialog_->UpdateGalleries(); 252 dialog_->UpdateGalleries();
253 } 253 }
254 254
255 base::string16 MediaGalleriesPermissionController::GetAcceptButtonText() const { 255 base::string16 MediaGalleriesPermissionController::GetAcceptButtonText() const {
256 return l10n_util::GetStringUTF16(IDS_MEDIA_GALLERIES_DIALOG_CONFIRM); 256 return l10n_util::GetStringUTF16(IDS_MEDIA_GALLERIES_DIALOG_CONFIRM);
257 } 257 }
258 258
259 void MediaGalleriesPermissionController::DialogFinished(bool accepted) { 259 void MediaGalleriesPermissionController::DialogFinished(bool accepted) {
(...skipping 132 matching lines...) Expand 10 before | Expand all | Expand 10 after
392 known_galleries_[gallery_id] = Entry(gallery, false); 392 known_galleries_[gallery_id] = Entry(gallery, false);
393 known_galleries_[gallery_id].pref_info.pref_id = gallery_id; 393 known_galleries_[gallery_id].pref_info.pref_id = gallery_id;
394 } 394 }
395 395
396 pref_permitted_galleries_ = preferences_->GalleriesForExtension(*extension_); 396 pref_permitted_galleries_ = preferences_->GalleriesForExtension(*extension_);
397 397
398 for (MediaGalleryPrefIdSet::iterator iter = pref_permitted_galleries_.begin(); 398 for (MediaGalleryPrefIdSet::iterator iter = pref_permitted_galleries_.begin();
399 iter != pref_permitted_galleries_.end(); 399 iter != pref_permitted_galleries_.end();
400 ++iter) { 400 ++iter) {
401 GalleryDialogId gallery_id = GetDialogId(*iter); 401 GalleryDialogId gallery_id = GetDialogId(*iter);
402 DCHECK(ContainsKey(known_galleries_, gallery_id)); 402 DCHECK(base::ContainsKey(known_galleries_, gallery_id));
403 known_galleries_[gallery_id].selected = true; 403 known_galleries_[gallery_id].selected = true;
404 } 404 }
405 405
406 // Preserve state of toggled galleries. 406 // Preserve state of toggled galleries.
407 for (ToggledGalleryMap::const_iterator iter = toggled_galleries_.begin(); 407 for (ToggledGalleryMap::const_iterator iter = toggled_galleries_.begin();
408 iter != toggled_galleries_.end(); 408 iter != toggled_galleries_.end();
409 ++iter) { 409 ++iter) {
410 known_galleries_[iter->first].selected = iter->second; 410 known_galleries_[iter->first].selected = iter->second;
411 } 411 }
412 } 412 }
413 413
414 void MediaGalleriesPermissionController::SavePermissions() { 414 void MediaGalleriesPermissionController::SavePermissions() {
415 DCHECK(preferences_); 415 DCHECK(preferences_);
416 media_galleries::UsageCount(media_galleries::SAVE_DIALOG); 416 media_galleries::UsageCount(media_galleries::SAVE_DIALOG);
417 for (GalleryPermissionsMap::const_iterator iter = known_galleries_.begin(); 417 for (GalleryPermissionsMap::const_iterator iter = known_galleries_.begin();
418 iter != known_galleries_.end(); ++iter) { 418 iter != known_galleries_.end(); ++iter) {
419 MediaGalleryPrefId pref_id = GetPrefId(iter->first); 419 MediaGalleryPrefId pref_id = GetPrefId(iter->first);
420 if (ContainsKey(forgotten_galleries_, iter->first)) { 420 if (base::ContainsKey(forgotten_galleries_, iter->first)) {
421 preferences_->ForgetGalleryById(pref_id); 421 preferences_->ForgetGalleryById(pref_id);
422 } else { 422 } else {
423 bool changed = preferences_->SetGalleryPermissionForExtension( 423 bool changed = preferences_->SetGalleryPermissionForExtension(
424 *extension_, pref_id, iter->second.selected); 424 *extension_, pref_id, iter->second.selected);
425 if (changed) { 425 if (changed) {
426 if (iter->second.selected) { 426 if (iter->second.selected) {
427 media_galleries::UsageCount( 427 media_galleries::UsageCount(
428 media_galleries::DIALOG_PERMISSION_ADDED); 428 media_galleries::DIALOG_PERMISSION_ADDED);
429 } else { 429 } else {
430 media_galleries::UsageCount( 430 media_galleries::UsageCount(
(...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after
539 MediaGalleryPrefId 539 MediaGalleryPrefId
540 MediaGalleriesPermissionController::DialogIdMap::GetPrefId( 540 MediaGalleriesPermissionController::DialogIdMap::GetPrefId(
541 GalleryDialogId id) const { 541 GalleryDialogId id) const {
542 DCHECK_LT(id, next_dialog_id_); 542 DCHECK_LT(id, next_dialog_id_);
543 return forward_mapping_[id]; 543 return forward_mapping_[id];
544 } 544 }
545 545
546 // MediaGalleries dialog ------------------------------------------------------- 546 // MediaGalleries dialog -------------------------------------------------------
547 547
548 MediaGalleriesDialog::~MediaGalleriesDialog() {} 548 MediaGalleriesDialog::~MediaGalleriesDialog() {}
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698