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

Side by Side Diff: chrome/browser/media_gallery/media_galleries_dialog_controller.cc

Issue 10836199: Clean up media gallery preferences. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix unit tets x2 Created 8 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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_gallery/media_galleries_dialog_controller.h" 5 #include "chrome/browser/media_gallery/media_galleries_dialog_controller.h"
6 6
7 #include "base/path_service.h" 7 #include "base/path_service.h"
8 #include "base/utf_string_conversions.h" 8 #include "base/utf_string_conversions.h"
9 #include "chrome/browser/media_gallery/media_galleries_preferences_factory.h" 9 #include "chrome/browser/media_gallery/media_galleries_preferences_factory.h"
10 #include "chrome/browser/ui/chrome_select_file_policy.h" 10 #include "chrome/browser/ui/chrome_select_file_policy.h"
(...skipping 130 matching lines...) Expand 10 before | Expand all | Expand 10 after
141 for (MediaGalleriesPrefInfoMap::const_iterator iter = 141 for (MediaGalleriesPrefInfoMap::const_iterator iter =
142 preferences_->known_galleries().begin(); 142 preferences_->known_galleries().begin();
143 iter != preferences_->known_galleries().end(); 143 iter != preferences_->known_galleries().end();
144 ++iter) { 144 ++iter) {
145 if (iter->second.type == MediaGalleryPrefInfo::kBlackListed) 145 if (iter->second.type == MediaGalleryPrefInfo::kBlackListed)
146 continue; 146 continue;
147 147
148 known_galleries_[iter->first] = GalleryPermission(iter->second, false); 148 known_galleries_[iter->first] = GalleryPermission(iter->second, false);
149 } 149 }
150 150
151 std::set<MediaGalleryPrefId> permitted = 151 MediaGalleryPrefIdSet permitted =
152 preferences_->GalleriesForExtension(extension_); 152 preferences_->GalleriesForExtension(extension_);
153 153
154 for (std::set<MediaGalleryPrefId>::iterator iter = permitted.begin(); 154 for (MediaGalleryPrefIdSet::iterator iter = permitted.begin();
155 iter != permitted.end(); ++iter) { 155 iter != permitted.end(); ++iter) {
156 known_galleries_[*iter].allowed = true; 156 known_galleries_[*iter].allowed = true;
157 } 157 }
158 } 158 }
159 159
160 void MediaGalleriesDialogController::SavePermissions() { 160 void MediaGalleriesDialogController::SavePermissions() {
161 for (KnownGalleryPermissions::iterator iter = known_galleries_.begin(); 161 for (KnownGalleryPermissions::iterator iter = known_galleries_.begin();
162 iter != known_galleries_.end(); ++iter) { 162 iter != known_galleries_.end(); ++iter) {
163 preferences_->SetGalleryPermissionForExtension( 163 preferences_->SetGalleryPermissionForExtension(
164 extension_, iter->first, iter->second.allowed); 164 extension_, iter->first, iter->second.allowed);
(...skipping 11 matching lines...) Expand all
176 preferences_->SetGalleryPermissionForExtension( 176 preferences_->SetGalleryPermissionForExtension(
177 extension_, id, true); 177 extension_, id, true);
178 } 178 }
179 } 179 }
180 180
181 // MediaGalleries dialog ------------------------------------------------------- 181 // MediaGalleries dialog -------------------------------------------------------
182 182
183 MediaGalleriesDialog::~MediaGalleriesDialog() {} 183 MediaGalleriesDialog::~MediaGalleriesDialog() {}
184 184
185 } // namespace chrome 185 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698