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

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

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

Powered by Google App Engine
This is Rietveld 408576698