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 <set> | 7 #include <set> |
8 #include <string> | 8 #include <string> |
9 #include <vector> | 9 #include <vector> |
10 | 10 |
(...skipping 968 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
979 } | 979 } |
980 #endif // !defined(OS_ANDROID) && !defined(OS_CHROMEOS) | 980 #endif // !defined(OS_ANDROID) && !defined(OS_CHROMEOS) |
981 | 981 |
982 #if defined(OS_LINUX) || defined(OS_OPENBSD) || defined(OS_MACOSX) | 982 #if defined(OS_LINUX) || defined(OS_OPENBSD) || defined(OS_MACOSX) |
983 // Set the product channel for crash reports. | 983 // Set the product channel for crash reports. |
984 base::debug::SetCrashKeyValue(crash_keys::kChannel, | 984 base::debug::SetCrashKeyValue(crash_keys::kChannel, |
985 chrome::VersionInfo::GetVersionStringModifier()); | 985 chrome::VersionInfo::GetVersionStringModifier()); |
986 #endif // defined(OS_LINUX) || defined(OS_OPENBSD) || defined(OS_MACOSX) | 986 #endif // defined(OS_LINUX) || defined(OS_OPENBSD) || defined(OS_MACOSX) |
987 | 987 |
988 // Initialize tracking synchronizer system. | 988 // Initialize tracking synchronizer system. |
989 tracking_synchronizer_ = new metrics::TrackingSynchronizer(); | 989 tracking_synchronizer_ = |
| 990 new metrics::TrackingSynchronizer(base::TimeTicks::Now()); |
990 | 991 |
991 #if defined(OS_MACOSX) | 992 #if defined(OS_MACOSX) |
992 // Get the Keychain API to register for distributed notifications on the main | 993 // Get the Keychain API to register for distributed notifications on the main |
993 // thread, which has a proper CFRunloop, instead of later on the I/O thread, | 994 // thread, which has a proper CFRunloop, instead of later on the I/O thread, |
994 // which doesn't. This ensures those notifications will get delivered | 995 // which doesn't. This ensures those notifications will get delivered |
995 // properly. See issue 37766. | 996 // properly. See issue 37766. |
996 // (Note that the callback mask here is empty. I don't want to register for | 997 // (Note that the callback mask here is empty. I don't want to register for |
997 // any callbacks, I just want to initialize the mechanism.) | 998 // any callbacks, I just want to initialize the mechanism.) |
998 SecKeychainAddCallback(&KeychainCallback, 0, NULL); | 999 SecKeychainAddCallback(&KeychainCallback, 0, NULL); |
999 #endif // defined(OS_MACOSX) | 1000 #endif // defined(OS_MACOSX) |
(...skipping 730 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1730 chromeos::CrosSettings::Shutdown(); | 1731 chromeos::CrosSettings::Shutdown(); |
1731 #endif // defined(OS_CHROMEOS) | 1732 #endif // defined(OS_CHROMEOS) |
1732 #endif // defined(OS_ANDROID) | 1733 #endif // defined(OS_ANDROID) |
1733 } | 1734 } |
1734 | 1735 |
1735 // Public members: | 1736 // Public members: |
1736 | 1737 |
1737 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) { | 1738 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) { |
1738 chrome_extra_parts_.push_back(parts); | 1739 chrome_extra_parts_.push_back(parts); |
1739 } | 1740 } |
OLD | NEW |