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

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

Issue 2695883003: Change uses of base::JoinString to pass StringPieces where possible. (Closed)
Patch Set: Remove dependency CL. 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 13 matching lines...) Expand all
24 #include "base/logging.h" 24 #include "base/logging.h"
25 #include "base/memory/ptr_util.h" 25 #include "base/memory/ptr_util.h"
26 #include "base/metrics/field_trial.h" 26 #include "base/metrics/field_trial.h"
27 #include "base/metrics/histogram_macros.h" 27 #include "base/metrics/histogram_macros.h"
28 #include "base/path_service.h" 28 #include "base/path_service.h"
29 #include "base/profiler/scoped_tracker.h" 29 #include "base/profiler/scoped_tracker.h"
30 #include "base/profiler/stack_sampling_profiler.h" 30 #include "base/profiler/stack_sampling_profiler.h"
31 #include "base/run_loop.h" 31 #include "base/run_loop.h"
32 #include "base/strings/string16.h" 32 #include "base/strings/string16.h"
33 #include "base/strings/string_number_conversions.h" 33 #include "base/strings/string_number_conversions.h"
34 #include "base/strings/string_piece.h"
34 #include "base/strings/sys_string_conversions.h" 35 #include "base/strings/sys_string_conversions.h"
35 #include "base/strings/utf_string_conversions.h" 36 #include "base/strings/utf_string_conversions.h"
36 #include "base/sys_info.h" 37 #include "base/sys_info.h"
37 #include "base/threading/platform_thread.h" 38 #include "base/threading/platform_thread.h"
38 #include "base/time/default_tick_clock.h" 39 #include "base/time/default_tick_clock.h"
39 #include "base/time/time.h" 40 #include "base/time/time.h"
40 #include "base/trace_event/trace_event.h" 41 #include "base/trace_event/trace_event.h"
41 #include "base/values.h" 42 #include "base/values.h"
42 #include "build/build_config.h" 43 #include "build/build_config.h"
43 #include "cc/base/switches.h" 44 #include "cc/base/switches.h"
(...skipping 800 matching lines...) Expand 10 before | Expand all | Expand 10 after
844 if (!new_public_key.empty()) { 845 if (!new_public_key.empty()) {
845 command_line->AppendSwitchASCII( 846 command_line->AppendSwitchASCII(
846 switches::kOriginTrialPublicKey, 847 switches::kOriginTrialPublicKey,
847 local_state_->GetString(prefs::kOriginTrialPublicKey)); 848 local_state_->GetString(prefs::kOriginTrialPublicKey));
848 } 849 }
849 } 850 }
850 if (!command_line->HasSwitch(switches::kOriginTrialDisabledFeatures)) { 851 if (!command_line->HasSwitch(switches::kOriginTrialDisabledFeatures)) {
851 const base::ListValue* override_disabled_feature_list = 852 const base::ListValue* override_disabled_feature_list =
852 local_state_->GetList(prefs::kOriginTrialDisabledFeatures); 853 local_state_->GetList(prefs::kOriginTrialDisabledFeatures);
853 if (override_disabled_feature_list) { 854 if (override_disabled_feature_list) {
854 std::vector<std::string> disabled_features; 855 std::vector<base::StringPiece> disabled_features;
855 std::string disabled_feature; 856 base::StringPiece disabled_feature;
856 for (const auto& item : *override_disabled_feature_list) { 857 for (const auto& item : *override_disabled_feature_list) {
857 if (item->GetAsString(&disabled_feature)) { 858 if (item->GetAsString(&disabled_feature)) {
858 disabled_features.push_back(disabled_feature); 859 disabled_features.push_back(disabled_feature);
859 } 860 }
860 } 861 }
861 if (!disabled_features.empty()) { 862 if (!disabled_features.empty()) {
862 const std::string override_disabled_features = 863 const std::string override_disabled_features =
863 base::JoinString(disabled_features, "|"); 864 base::JoinString(disabled_features, "|");
864 command_line->AppendSwitchASCII(switches::kOriginTrialDisabledFeatures, 865 command_line->AppendSwitchASCII(switches::kOriginTrialDisabledFeatures,
865 override_disabled_features); 866 override_disabled_features);
866 } 867 }
867 } 868 }
868 } 869 }
869 if (!command_line->HasSwitch(switches::kOriginTrialDisabledTokens)) { 870 if (!command_line->HasSwitch(switches::kOriginTrialDisabledTokens)) {
870 const base::ListValue* disabled_token_list = 871 const base::ListValue* disabled_token_list =
871 local_state_->GetList(prefs::kOriginTrialDisabledTokens); 872 local_state_->GetList(prefs::kOriginTrialDisabledTokens);
872 if (disabled_token_list) { 873 if (disabled_token_list) {
873 std::vector<std::string> disabled_tokens; 874 std::vector<base::StringPiece> disabled_tokens;
874 std::string disabled_token; 875 base::StringPiece disabled_token;
875 for (const auto& item : *disabled_token_list) { 876 for (const auto& item : *disabled_token_list) {
876 if (item->GetAsString(&disabled_token)) { 877 if (item->GetAsString(&disabled_token)) {
877 disabled_tokens.push_back(disabled_token); 878 disabled_tokens.push_back(disabled_token);
878 } 879 }
879 } 880 }
880 if (!disabled_tokens.empty()) { 881 if (!disabled_tokens.empty()) {
881 const std::string disabled_token_switch = 882 const std::string disabled_token_switch =
882 base::JoinString(disabled_tokens, "|"); 883 base::JoinString(disabled_tokens, "|");
883 command_line->AppendSwitchASCII(switches::kOriginTrialDisabledTokens, 884 command_line->AppendSwitchASCII(switches::kOriginTrialDisabledTokens,
884 disabled_token_switch); 885 disabled_token_switch);
(...skipping 1188 matching lines...) Expand 10 before | Expand all | Expand 10 after
2073 chromeos::CrosSettings::Shutdown(); 2074 chromeos::CrosSettings::Shutdown();
2074 #endif // defined(OS_CHROMEOS) 2075 #endif // defined(OS_CHROMEOS)
2075 #endif // defined(OS_ANDROID) 2076 #endif // defined(OS_ANDROID)
2076 } 2077 }
2077 2078
2078 // Public members: 2079 // Public members:
2079 2080
2080 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) { 2081 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) {
2081 chrome_extra_parts_.push_back(parts); 2082 chrome_extra_parts_.push_back(parts);
2082 } 2083 }
OLDNEW
« no previous file with comments | « base/trace_event/trace_log.cc ('k') | chrome/browser/chromeos/accessibility/accessibility_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698