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

Side by Side Diff: chrome/browser/chrome_browser_main.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 (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 837 matching lines...) Expand 10 before | Expand all | Expand 10 after
848 local_state_->GetString(prefs::kOriginTrialPublicKey)); 848 local_state_->GetString(prefs::kOriginTrialPublicKey));
849 } 849 }
850 } 850 }
851 if (!command_line->HasSwitch(switches::kOriginTrialDisabledFeatures)) { 851 if (!command_line->HasSwitch(switches::kOriginTrialDisabledFeatures)) {
852 const base::ListValue* override_disabled_feature_list = 852 const base::ListValue* override_disabled_feature_list =
853 local_state_->GetList(prefs::kOriginTrialDisabledFeatures); 853 local_state_->GetList(prefs::kOriginTrialDisabledFeatures);
854 if (override_disabled_feature_list) { 854 if (override_disabled_feature_list) {
855 std::vector<base::StringPiece> disabled_features; 855 std::vector<base::StringPiece> disabled_features;
856 base::StringPiece disabled_feature; 856 base::StringPiece disabled_feature;
857 for (const auto& item : *override_disabled_feature_list) { 857 for (const auto& item : *override_disabled_feature_list) {
858 if (item.GetAsString(&disabled_feature)) { 858 if (item->GetAsString(&disabled_feature)) {
859 disabled_features.push_back(disabled_feature); 859 disabled_features.push_back(disabled_feature);
860 } 860 }
861 } 861 }
862 if (!disabled_features.empty()) { 862 if (!disabled_features.empty()) {
863 const std::string override_disabled_features = 863 const std::string override_disabled_features =
864 base::JoinString(disabled_features, "|"); 864 base::JoinString(disabled_features, "|");
865 command_line->AppendSwitchASCII(switches::kOriginTrialDisabledFeatures, 865 command_line->AppendSwitchASCII(switches::kOriginTrialDisabledFeatures,
866 override_disabled_features); 866 override_disabled_features);
867 } 867 }
868 } 868 }
869 } 869 }
870 if (!command_line->HasSwitch(switches::kOriginTrialDisabledTokens)) { 870 if (!command_line->HasSwitch(switches::kOriginTrialDisabledTokens)) {
871 const base::ListValue* disabled_token_list = 871 const base::ListValue* disabled_token_list =
872 local_state_->GetList(prefs::kOriginTrialDisabledTokens); 872 local_state_->GetList(prefs::kOriginTrialDisabledTokens);
873 if (disabled_token_list) { 873 if (disabled_token_list) {
874 std::vector<base::StringPiece> disabled_tokens; 874 std::vector<base::StringPiece> disabled_tokens;
875 base::StringPiece disabled_token; 875 base::StringPiece disabled_token;
876 for (const auto& item : *disabled_token_list) { 876 for (const auto& item : *disabled_token_list) {
877 if (item.GetAsString(&disabled_token)) { 877 if (item->GetAsString(&disabled_token)) {
878 disabled_tokens.push_back(disabled_token); 878 disabled_tokens.push_back(disabled_token);
879 } 879 }
880 } 880 }
881 if (!disabled_tokens.empty()) { 881 if (!disabled_tokens.empty()) {
882 const std::string disabled_token_switch = 882 const std::string disabled_token_switch =
883 base::JoinString(disabled_tokens, "|"); 883 base::JoinString(disabled_tokens, "|");
884 command_line->AppendSwitchASCII(switches::kOriginTrialDisabledTokens, 884 command_line->AppendSwitchASCII(switches::kOriginTrialDisabledTokens,
885 disabled_token_switch); 885 disabled_token_switch);
886 } 886 }
887 } 887 }
(...skipping 1186 matching lines...) Expand 10 before | Expand all | Expand 10 after
2074 chromeos::CrosSettings::Shutdown(); 2074 chromeos::CrosSettings::Shutdown();
2075 #endif // defined(OS_CHROMEOS) 2075 #endif // defined(OS_CHROMEOS)
2076 #endif // defined(OS_ANDROID) 2076 #endif // defined(OS_ANDROID)
2077 } 2077 }
2078 2078
2079 // Public members: 2079 // Public members:
2080 2080
2081 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) { 2081 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) {
2082 chrome_extra_parts_.push_back(parts); 2082 chrome_extra_parts_.push_back(parts);
2083 } 2083 }
OLDNEW
« no previous file with comments | « chrome/browser/android/vr_shell/ui_scene.cc ('k') | chrome/browser/chrome_content_browser_client.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698