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

Side by Side Diff: chrome/browser/chrome_browser_main.cc

Issue 2740143002: Change base::Value::ListStorage to std::vector<base::Value> (Closed)
Patch Set: Comment Updates Created 3 years, 9 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 (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/chrome_browser_main.h" 5 #include "chrome/browser/chrome_browser_main.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include <set> 10 #include <set>
(...skipping 838 matching lines...) Expand 10 before | Expand all | Expand 10 after
849 local_state_->GetString(prefs::kOriginTrialPublicKey)); 849 local_state_->GetString(prefs::kOriginTrialPublicKey));
850 } 850 }
851 } 851 }
852 if (!command_line->HasSwitch(switches::kOriginTrialDisabledFeatures)) { 852 if (!command_line->HasSwitch(switches::kOriginTrialDisabledFeatures)) {
853 const base::ListValue* override_disabled_feature_list = 853 const base::ListValue* override_disabled_feature_list =
854 local_state_->GetList(prefs::kOriginTrialDisabledFeatures); 854 local_state_->GetList(prefs::kOriginTrialDisabledFeatures);
855 if (override_disabled_feature_list) { 855 if (override_disabled_feature_list) {
856 std::vector<std::string> disabled_features; 856 std::vector<std::string> disabled_features;
857 std::string disabled_feature; 857 std::string disabled_feature;
858 for (const auto& item : *override_disabled_feature_list) { 858 for (const auto& item : *override_disabled_feature_list) {
859 if (item->GetAsString(&disabled_feature)) { 859 if (item.GetAsString(&disabled_feature)) {
860 disabled_features.push_back(disabled_feature); 860 disabled_features.push_back(disabled_feature);
861 } 861 }
862 } 862 }
863 if (!disabled_features.empty()) { 863 if (!disabled_features.empty()) {
864 const std::string override_disabled_features = 864 const std::string override_disabled_features =
865 base::JoinString(disabled_features, "|"); 865 base::JoinString(disabled_features, "|");
866 command_line->AppendSwitchASCII(switches::kOriginTrialDisabledFeatures, 866 command_line->AppendSwitchASCII(switches::kOriginTrialDisabledFeatures,
867 override_disabled_features); 867 override_disabled_features);
868 } 868 }
869 } 869 }
(...skipping 1216 matching lines...) Expand 10 before | Expand all | Expand 10 after
2086 chromeos::CrosSettings::Shutdown(); 2086 chromeos::CrosSettings::Shutdown();
2087 #endif // defined(OS_CHROMEOS) 2087 #endif // defined(OS_CHROMEOS)
2088 #endif // defined(OS_ANDROID) 2088 #endif // defined(OS_ANDROID)
2089 } 2089 }
2090 2090
2091 // Public members: 2091 // Public members:
2092 2092
2093 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) { 2093 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) {
2094 chrome_extra_parts_.push_back(parts); 2094 chrome_extra_parts_.push_back(parts);
2095 } 2095 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698