OLD | NEW |
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 Loading... |
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 802 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
846 if (!new_public_key.empty()) { | 847 if (!new_public_key.empty()) { |
847 command_line->AppendSwitchASCII( | 848 command_line->AppendSwitchASCII( |
848 switches::kOriginTrialPublicKey, | 849 switches::kOriginTrialPublicKey, |
849 local_state_->GetString(prefs::kOriginTrialPublicKey)); | 850 local_state_->GetString(prefs::kOriginTrialPublicKey)); |
850 } | 851 } |
851 } | 852 } |
852 if (!command_line->HasSwitch(switches::kOriginTrialDisabledFeatures)) { | 853 if (!command_line->HasSwitch(switches::kOriginTrialDisabledFeatures)) { |
853 const base::ListValue* override_disabled_feature_list = | 854 const base::ListValue* override_disabled_feature_list = |
854 local_state_->GetList(prefs::kOriginTrialDisabledFeatures); | 855 local_state_->GetList(prefs::kOriginTrialDisabledFeatures); |
855 if (override_disabled_feature_list) { | 856 if (override_disabled_feature_list) { |
856 std::vector<std::string> disabled_features; | 857 std::vector<base::StringPiece> disabled_features; |
857 std::string disabled_feature; | 858 base::StringPiece disabled_feature; |
858 for (const auto& item : *override_disabled_feature_list) { | 859 for (const auto& item : *override_disabled_feature_list) { |
859 if (item->GetAsString(&disabled_feature)) { | 860 if (item->GetAsString(&disabled_feature)) { |
860 disabled_features.push_back(disabled_feature); | 861 disabled_features.push_back(disabled_feature); |
861 } | 862 } |
862 } | 863 } |
863 if (!disabled_features.empty()) { | 864 if (!disabled_features.empty()) { |
864 const std::string override_disabled_features = | 865 const std::string override_disabled_features = |
865 base::JoinString(disabled_features, "|"); | 866 base::JoinString(disabled_features, "|"); |
866 command_line->AppendSwitchASCII(switches::kOriginTrialDisabledFeatures, | 867 command_line->AppendSwitchASCII(switches::kOriginTrialDisabledFeatures, |
867 override_disabled_features); | 868 override_disabled_features); |
(...skipping 1218 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2086 chromeos::CrosSettings::Shutdown(); | 2087 chromeos::CrosSettings::Shutdown(); |
2087 #endif // defined(OS_CHROMEOS) | 2088 #endif // defined(OS_CHROMEOS) |
2088 #endif // defined(OS_ANDROID) | 2089 #endif // defined(OS_ANDROID) |
2089 } | 2090 } |
2090 | 2091 |
2091 // Public members: | 2092 // Public members: |
2092 | 2093 |
2093 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) { | 2094 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) { |
2094 chrome_extra_parts_.push_back(parts); | 2095 chrome_extra_parts_.push_back(parts); |
2095 } | 2096 } |
OLD | NEW |