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

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

Issue 2740143002: Change base::Value::ListStorage to std::vector<base::Value> (Closed)
Patch Set: Fix Android Compilation Error 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 (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 836 matching lines...) Expand 10 before | Expand all | Expand 10 after
847 local_state_->GetString(prefs::kOriginTrialPublicKey)); 847 local_state_->GetString(prefs::kOriginTrialPublicKey));
848 } 848 }
849 } 849 }
850 if (!command_line->HasSwitch(switches::kOriginTrialDisabledFeatures)) { 850 if (!command_line->HasSwitch(switches::kOriginTrialDisabledFeatures)) {
851 const base::ListValue* override_disabled_feature_list = 851 const base::ListValue* override_disabled_feature_list =
852 local_state_->GetList(prefs::kOriginTrialDisabledFeatures); 852 local_state_->GetList(prefs::kOriginTrialDisabledFeatures);
853 if (override_disabled_feature_list) { 853 if (override_disabled_feature_list) {
854 std::vector<std::string> disabled_features; 854 std::vector<std::string> disabled_features;
855 std::string disabled_feature; 855 std::string disabled_feature;
856 for (const auto& item : *override_disabled_feature_list) { 856 for (const auto& item : *override_disabled_feature_list) {
857 if (item->GetAsString(&disabled_feature)) { 857 if (item.GetAsString(&disabled_feature)) {
858 disabled_features.push_back(disabled_feature); 858 disabled_features.push_back(disabled_feature);
859 } 859 }
860 } 860 }
861 if (!disabled_features.empty()) { 861 if (!disabled_features.empty()) {
862 const std::string override_disabled_features = 862 const std::string override_disabled_features =
863 base::JoinString(disabled_features, "|"); 863 base::JoinString(disabled_features, "|");
864 command_line->AppendSwitchASCII(switches::kOriginTrialDisabledFeatures, 864 command_line->AppendSwitchASCII(switches::kOriginTrialDisabledFeatures,
865 override_disabled_features); 865 override_disabled_features);
866 } 866 }
867 } 867 }
868 } 868 }
869 if (!command_line->HasSwitch(switches::kOriginTrialDisabledTokens)) { 869 if (!command_line->HasSwitch(switches::kOriginTrialDisabledTokens)) {
870 const base::ListValue* disabled_token_list = 870 const base::ListValue* disabled_token_list =
871 local_state_->GetList(prefs::kOriginTrialDisabledTokens); 871 local_state_->GetList(prefs::kOriginTrialDisabledTokens);
872 if (disabled_token_list) { 872 if (disabled_token_list) {
873 std::vector<std::string> disabled_tokens; 873 std::vector<std::string> disabled_tokens;
874 std::string disabled_token; 874 std::string disabled_token;
875 for (const auto& item : *disabled_token_list) { 875 for (const auto& item : *disabled_token_list) {
876 if (item->GetAsString(&disabled_token)) { 876 if (item.GetAsString(&disabled_token)) {
877 disabled_tokens.push_back(disabled_token); 877 disabled_tokens.push_back(disabled_token);
878 } 878 }
879 } 879 }
880 if (!disabled_tokens.empty()) { 880 if (!disabled_tokens.empty()) {
881 const std::string disabled_token_switch = 881 const std::string disabled_token_switch =
882 base::JoinString(disabled_tokens, "|"); 882 base::JoinString(disabled_tokens, "|");
883 command_line->AppendSwitchASCII(switches::kOriginTrialDisabledTokens, 883 command_line->AppendSwitchASCII(switches::kOriginTrialDisabledTokens,
884 disabled_token_switch); 884 disabled_token_switch);
885 } 885 }
886 } 886 }
(...skipping 1186 matching lines...) Expand 10 before | Expand all | Expand 10 after
2073 chromeos::CrosSettings::Shutdown(); 2073 chromeos::CrosSettings::Shutdown();
2074 #endif // defined(OS_CHROMEOS) 2074 #endif // defined(OS_CHROMEOS)
2075 #endif // defined(OS_ANDROID) 2075 #endif // defined(OS_ANDROID)
2076 } 2076 }
2077 2077
2078 // Public members: 2078 // Public members:
2079 2079
2080 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) { 2080 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) {
2081 chrome_extra_parts_.push_back(parts); 2081 chrome_extra_parts_.push_back(parts);
2082 } 2082 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698