| 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 <algorithm> | 10 #include <algorithm> |
| (...skipping 874 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 885 } | 885 } |
| 886 | 886 |
| 887 // Initialize FieldTrialSynchronizer system. This is a singleton and is used | 887 // Initialize FieldTrialSynchronizer system. This is a singleton and is used |
| 888 // for posting tasks via base::Bind. Its deleted when it goes out of scope. | 888 // for posting tasks via base::Bind. Its deleted when it goes out of scope. |
| 889 // Even though base::Bind does AddRef and Release, the object will not be | 889 // Even though base::Bind does AddRef and Release, the object will not be |
| 890 // deleted after the Task is executed. | 890 // deleted after the Task is executed. |
| 891 field_trial_synchronizer_ = new FieldTrialSynchronizer(); | 891 field_trial_synchronizer_ = new FieldTrialSynchronizer(); |
| 892 | 892 |
| 893 // Register a synthetic field trial for the sampling profiler configuration | 893 // Register a synthetic field trial for the sampling profiler configuration |
| 894 // that was already chosen. | 894 // that was already chosen. |
| 895 sampling_profiler_config_.RegisterSyntheticFieldTrial(); | 895 sampling_profiler_config_.RegisterSyntheticFieldTrial( |
| 896 base::Bind(&ChromeMetricsServiceAccessor::RegisterSyntheticFieldTrial)); |
| 896 | 897 |
| 897 #if defined(OS_WIN) || defined(OS_MACOSX) || \ | 898 #if defined(OS_WIN) || defined(OS_MACOSX) || \ |
| 898 (defined(OS_LINUX) && !defined(OS_CHROMEOS)) | 899 (defined(OS_LINUX) && !defined(OS_CHROMEOS)) |
| 899 metrics::DesktopSessionDurationTracker::Initialize(); | 900 metrics::DesktopSessionDurationTracker::Initialize(); |
| 900 #endif | 901 #endif |
| 901 | 902 |
| 902 #if defined(OS_WIN) | 903 #if defined(OS_WIN) |
| 903 // Cleanup the PreRead field trial registry key. | 904 // Cleanup the PreRead field trial registry key. |
| 904 // TODO(fdoray): Remove this when M56 hits stable. | 905 // TODO(fdoray): Remove this when M56 hits stable. |
| 905 const base::string16 pre_read_field_trial_registry_path = | 906 const base::string16 pre_read_field_trial_registry_path = |
| (...skipping 1312 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2218 chromeos::CrosSettings::Shutdown(); | 2219 chromeos::CrosSettings::Shutdown(); |
| 2219 #endif // defined(OS_CHROMEOS) | 2220 #endif // defined(OS_CHROMEOS) |
| 2220 #endif // defined(OS_ANDROID) | 2221 #endif // defined(OS_ANDROID) |
| 2221 } | 2222 } |
| 2222 | 2223 |
| 2223 // Public members: | 2224 // Public members: |
| 2224 | 2225 |
| 2225 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) { | 2226 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) { |
| 2226 chrome_extra_parts_.push_back(parts); | 2227 chrome_extra_parts_.push_back(parts); |
| 2227 } | 2228 } |
| OLD | NEW |