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 257 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
268 #endif | 268 #endif |
269 | 269 |
270 #if defined(USE_AURA) | 270 #if defined(USE_AURA) |
271 #include "chrome/browser/lifetime/application_lifetime.h" | 271 #include "chrome/browser/lifetime/application_lifetime.h" |
272 #include "content/public/common/mojo_shell_connection.h" | 272 #include "content/public/common/mojo_shell_connection.h" |
273 #include "services/shell/runner/common/client_util.h" | 273 #include "services/shell/runner/common/client_util.h" |
274 #endif | 274 #endif |
275 | 275 |
276 #if defined(OS_WIN) || defined(OS_MACOSX) || \ | 276 #if defined(OS_WIN) || defined(OS_MACOSX) || \ |
277 (defined(OS_LINUX) && !defined(OS_CHROMEOS)) | 277 (defined(OS_LINUX) && !defined(OS_CHROMEOS)) |
278 #include "chrome/browser/metrics/desktop_engagement/desktop_engagement_service.h
" | 278 #include "chrome/browser/metrics/desktop_session_duration/desktop_session_durati
on_tracker.h" |
279 #endif | 279 #endif |
280 | 280 |
281 using content::BrowserThread; | 281 using content::BrowserThread; |
282 | 282 |
283 namespace { | 283 namespace { |
284 | 284 |
285 // A provider of Geolocation services to override AccessTokenStore. | 285 // A provider of Geolocation services to override AccessTokenStore. |
286 class ChromeGeolocationDelegate : public device::GeolocationDelegate { | 286 class ChromeGeolocationDelegate : public device::GeolocationDelegate { |
287 public: | 287 public: |
288 ChromeGeolocationDelegate() = default; | 288 ChromeGeolocationDelegate() = default; |
(...skipping 623 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
912 // Don't enable instrumentation. | 912 // Don't enable instrumentation. |
913 break; | 913 break; |
914 } | 914 } |
915 | 915 |
916 // Register a synthetic field trial for the sampling profiler configuration | 916 // Register a synthetic field trial for the sampling profiler configuration |
917 // that was already chosen. | 917 // that was already chosen. |
918 sampling_profiler_config_.RegisterSyntheticFieldTrial(); | 918 sampling_profiler_config_.RegisterSyntheticFieldTrial(); |
919 | 919 |
920 #if defined(OS_WIN) || defined(OS_MACOSX) || \ | 920 #if defined(OS_WIN) || defined(OS_MACOSX) || \ |
921 (defined(OS_LINUX) && !defined(OS_CHROMEOS)) | 921 (defined(OS_LINUX) && !defined(OS_CHROMEOS)) |
922 metrics::DesktopEngagementService::Initialize(); | 922 metrics::DesktopSessionDurationTracker::Initialize(); |
923 #endif | 923 #endif |
924 | 924 |
925 #if defined(OS_WIN) | 925 #if defined(OS_WIN) |
926 // Cleanup the PreRead field trial registry key. | 926 // Cleanup the PreRead field trial registry key. |
927 // TODO(fdoray): Remove this when M56 hits stable. | 927 // TODO(fdoray): Remove this when M56 hits stable. |
928 const base::string16 pre_read_field_trial_registry_path = | 928 const base::string16 pre_read_field_trial_registry_path = |
929 BrowserDistribution::GetDistribution()->GetRegistryPath() + | 929 BrowserDistribution::GetDistribution()->GetRegistryPath() + |
930 L"\\PreReadFieldTrial"; | 930 L"\\PreReadFieldTrial"; |
931 base::win::RegKey(HKEY_CURRENT_USER, | 931 base::win::RegKey(HKEY_CURRENT_USER, |
932 pre_read_field_trial_registry_path.c_str(), KEY_SET_VALUE) | 932 pre_read_field_trial_registry_path.c_str(), KEY_SET_VALUE) |
(...skipping 1274 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2207 chromeos::CrosSettings::Shutdown(); | 2207 chromeos::CrosSettings::Shutdown(); |
2208 #endif // defined(OS_CHROMEOS) | 2208 #endif // defined(OS_CHROMEOS) |
2209 #endif // defined(OS_ANDROID) | 2209 #endif // defined(OS_ANDROID) |
2210 } | 2210 } |
2211 | 2211 |
2212 // Public members: | 2212 // Public members: |
2213 | 2213 |
2214 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) { | 2214 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) { |
2215 chrome_extra_parts_.push_back(parts); | 2215 chrome_extra_parts_.push_back(parts); |
2216 } | 2216 } |
OLD | NEW |