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

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

Issue 1021053003: Delivering the FIRST_NONEMPTY_PAINT phase changing event to base/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@phase_splitting
Patch Set: More comments. Created 5 years, 7 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 15 matching lines...) Expand all
26 #include "base/process/process_info.h" 26 #include "base/process/process_info.h"
27 #include "base/profiler/scoped_tracker.h" 27 #include "base/profiler/scoped_tracker.h"
28 #include "base/run_loop.h" 28 #include "base/run_loop.h"
29 #include "base/strings/string_number_conversions.h" 29 #include "base/strings/string_number_conversions.h"
30 #include "base/strings/string_piece.h" 30 #include "base/strings/string_piece.h"
31 #include "base/strings/string_split.h" 31 #include "base/strings/string_split.h"
32 #include "base/strings/sys_string_conversions.h" 32 #include "base/strings/sys_string_conversions.h"
33 #include "base/strings/utf_string_conversions.h" 33 #include "base/strings/utf_string_conversions.h"
34 #include "base/sys_info.h" 34 #include "base/sys_info.h"
35 #include "base/threading/platform_thread.h" 35 #include "base/threading/platform_thread.h"
36 #include "base/time/default_tick_clock.h"
36 #include "base/time/time.h" 37 #include "base/time/time.h"
37 #include "base/trace_event/trace_event.h" 38 #include "base/trace_event/trace_event.h"
38 #include "base/values.h" 39 #include "base/values.h"
39 #include "build/build_config.h" 40 #include "build/build_config.h"
40 #include "cc/base/switches.h" 41 #include "cc/base/switches.h"
41 #include "chrome/browser/about_flags.h" 42 #include "chrome/browser/about_flags.h"
42 #include "chrome/browser/browser_process.h" 43 #include "chrome/browser/browser_process.h"
43 #include "chrome/browser/browser_process_impl.h" 44 #include "chrome/browser/browser_process_impl.h"
44 #include "chrome/browser/browser_process_platform_part.h" 45 #include "chrome/browser/browser_process_platform_part.h"
45 #include "chrome/browser/browser_shutdown.h" 46 #include "chrome/browser/browser_shutdown.h"
(...skipping 932 matching lines...) Expand 10 before | Expand all | Expand 10 after
978 } 979 }
979 #endif // !defined(OS_ANDROID) && !defined(OS_CHROMEOS) 980 #endif // !defined(OS_ANDROID) && !defined(OS_CHROMEOS)
980 981
981 #if defined(OS_LINUX) || defined(OS_OPENBSD) || defined(OS_MACOSX) 982 #if defined(OS_LINUX) || defined(OS_OPENBSD) || defined(OS_MACOSX)
982 // Set the product channel for crash reports. 983 // Set the product channel for crash reports.
983 base::debug::SetCrashKeyValue(crash_keys::kChannel, 984 base::debug::SetCrashKeyValue(crash_keys::kChannel,
984 chrome::VersionInfo::GetVersionStringModifier()); 985 chrome::VersionInfo::GetVersionStringModifier());
985 #endif // defined(OS_LINUX) || defined(OS_OPENBSD) || defined(OS_MACOSX) 986 #endif // defined(OS_LINUX) || defined(OS_OPENBSD) || defined(OS_MACOSX)
986 987
987 // Initialize tracking synchronizer system. 988 // Initialize tracking synchronizer system.
988 tracking_synchronizer_ = 989 tracking_synchronizer_ = new metrics::TrackingSynchronizer(
989 new metrics::TrackingSynchronizer(base::TimeTicks::Now()); 990 make_scoped_ptr(new base::DefaultTickClock()));
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
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 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698