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

Side by Side Diff: components/flags_ui/pref_service_flags_storage.cc

Issue 2816513002: Revert of Change base::Value::ListStorage to std::vector<base::Value> (Closed)
Patch Set: Created 3 years, 8 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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 "components/flags_ui/pref_service_flags_storage.h" 5 #include "components/flags_ui/pref_service_flags_storage.h"
6 6
7 #include "base/values.h" 7 #include "base/values.h"
8 #include "build/build_config.h" 8 #include "build/build_config.h"
9 #include "components/flags_ui/flags_ui_pref_names.h" 9 #include "components/flags_ui/flags_ui_pref_names.h"
10 #include "components/pref_registry/pref_registry_syncable.h" 10 #include "components/pref_registry/pref_registry_syncable.h"
11 #include "components/prefs/pref_registry_simple.h" 11 #include "components/prefs/pref_registry_simple.h"
12 #include "components/prefs/pref_service.h" 12 #include "components/prefs/pref_service.h"
13 #include "components/prefs/scoped_user_pref_update.h" 13 #include "components/prefs/scoped_user_pref_update.h"
14 14
15 namespace flags_ui { 15 namespace flags_ui {
16 16
17 PrefServiceFlagsStorage::PrefServiceFlagsStorage(PrefService* prefs) 17 PrefServiceFlagsStorage::PrefServiceFlagsStorage(PrefService* prefs)
18 : prefs_(prefs) {} 18 : prefs_(prefs) {}
19 19
20 PrefServiceFlagsStorage::~PrefServiceFlagsStorage() {} 20 PrefServiceFlagsStorage::~PrefServiceFlagsStorage() {}
21 21
22 std::set<std::string> PrefServiceFlagsStorage::GetFlags() { 22 std::set<std::string> PrefServiceFlagsStorage::GetFlags() {
23 const base::ListValue* enabled_experiments = 23 const base::ListValue* enabled_experiments =
24 prefs_->GetList(prefs::kEnabledLabsExperiments); 24 prefs_->GetList(prefs::kEnabledLabsExperiments);
25 std::set<std::string> flags; 25 std::set<std::string> flags;
26 for (base::ListValue::const_iterator it = enabled_experiments->begin(); 26 for (base::ListValue::const_iterator it = enabled_experiments->begin();
27 it != enabled_experiments->end(); ++it) { 27 it != enabled_experiments->end(); ++it) {
28 std::string experiment_name; 28 std::string experiment_name;
29 if (!it->GetAsString(&experiment_name)) { 29 if (!(*it)->GetAsString(&experiment_name)) {
30 LOG(WARNING) << "Invalid entry in " << prefs::kEnabledLabsExperiments; 30 LOG(WARNING) << "Invalid entry in " << prefs::kEnabledLabsExperiments;
31 continue; 31 continue;
32 } 32 }
33 flags.insert(experiment_name); 33 flags.insert(experiment_name);
34 } 34 }
35 return flags; 35 return flags;
36 } 36 }
37 37
38 bool PrefServiceFlagsStorage::SetFlags(const std::set<std::string>& flags) { 38 bool PrefServiceFlagsStorage::SetFlags(const std::set<std::string>& flags) {
39 ListPrefUpdate update(prefs_, prefs::kEnabledLabsExperiments); 39 ListPrefUpdate update(prefs_, prefs::kEnabledLabsExperiments);
(...skipping 15 matching lines...) Expand all
55 55
56 #if defined(OS_CHROMEOS) 56 #if defined(OS_CHROMEOS)
57 // static 57 // static
58 void PrefServiceFlagsStorage::RegisterProfilePrefs( 58 void PrefServiceFlagsStorage::RegisterProfilePrefs(
59 user_prefs::PrefRegistrySyncable* registry) { 59 user_prefs::PrefRegistrySyncable* registry) {
60 registry->RegisterListPref(prefs::kEnabledLabsExperiments); 60 registry->RegisterListPref(prefs::kEnabledLabsExperiments);
61 } 61 }
62 #endif // defined(OS_CHROMEOS) 62 #endif // defined(OS_CHROMEOS)
63 63
64 } // namespace flags_ui 64 } // namespace flags_ui
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698