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 #if defined(TOOLKIT_GTK) | 7 #if defined(TOOLKIT_GTK) |
8 #include <gtk/gtk.h> | 8 #include <gtk/gtk.h> |
9 #endif | 9 #endif |
10 | 10 |
(...skipping 1034 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1045 | 1045 |
1046 void ChromeBrowserMainParts::PostProfileInit() { | 1046 void ChromeBrowserMainParts::PostProfileInit() { |
1047 LaunchDevToolsHandlerIfNeeded(profile(), parsed_command_line()); | 1047 LaunchDevToolsHandlerIfNeeded(profile(), parsed_command_line()); |
1048 for (size_t i = 0; i < chrome_extra_parts_.size(); ++i) | 1048 for (size_t i = 0; i < chrome_extra_parts_.size(); ++i) |
1049 chrome_extra_parts_[i]->PostProfileInit(); | 1049 chrome_extra_parts_[i]->PostProfileInit(); |
1050 } | 1050 } |
1051 | 1051 |
1052 void ChromeBrowserMainParts::PreBrowserStart() { | 1052 void ChromeBrowserMainParts::PreBrowserStart() { |
1053 for (size_t i = 0; i < chrome_extra_parts_.size(); ++i) | 1053 for (size_t i = 0; i < chrome_extra_parts_.size(); ++i) |
1054 chrome_extra_parts_[i]->PreBrowserStart(); | 1054 chrome_extra_parts_[i]->PreBrowserStart(); |
1055 #if !defined(OS_ANDROID) | |
1056 gpu_util::InstallBrowserMonitor(); | |
1057 #endif | |
1058 | 1055 |
1059 three_d_observer_.reset(new ThreeDAPIObserver()); | 1056 three_d_observer_.reset(new ThreeDAPIObserver()); |
1060 } | 1057 } |
1061 | 1058 |
1062 void ChromeBrowserMainParts::PostBrowserStart() { | 1059 void ChromeBrowserMainParts::PostBrowserStart() { |
1063 #if !defined(OS_ANDROID) | 1060 #if !defined(OS_ANDROID) |
1064 if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kVisitURLs)) | 1061 if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kVisitURLs)) |
1065 RunPageCycler(); | 1062 RunPageCycler(); |
1066 #endif | 1063 #endif |
1067 | 1064 |
(...skipping 627 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1695 // Start watching for jank during shutdown. It gets disarmed when | 1692 // Start watching for jank during shutdown. It gets disarmed when |
1696 // |shutdown_watcher_| object is destructed. | 1693 // |shutdown_watcher_| object is destructed. |
1697 shutdown_watcher_->Arm(base::TimeDelta::FromSeconds(300)); | 1694 shutdown_watcher_->Arm(base::TimeDelta::FromSeconds(300)); |
1698 | 1695 |
1699 // Disarm the startup hang detector time bomb if it is still Arm'ed. | 1696 // Disarm the startup hang detector time bomb if it is still Arm'ed. |
1700 startup_watcher_->Disarm(); | 1697 startup_watcher_->Disarm(); |
1701 | 1698 |
1702 for (size_t i = 0; i < chrome_extra_parts_.size(); ++i) | 1699 for (size_t i = 0; i < chrome_extra_parts_.size(); ++i) |
1703 chrome_extra_parts_[i]->PostMainMessageLoopRun(); | 1700 chrome_extra_parts_[i]->PostMainMessageLoopRun(); |
1704 | 1701 |
1705 #if !defined(OS_ANDROID) | |
1706 gpu_util::UninstallBrowserMonitor(); | |
1707 #endif | |
1708 | |
1709 #if defined(OS_WIN) | 1702 #if defined(OS_WIN) |
1710 // Log the search engine chosen on first run. Do this at shutdown, after any | 1703 // Log the search engine chosen on first run. Do this at shutdown, after any |
1711 // changes are made from the first run bubble link, etc. | 1704 // changes are made from the first run bubble link, etc. |
1712 if (record_search_engine_) { | 1705 if (record_search_engine_) { |
1713 TemplateURLService* url_service = | 1706 TemplateURLService* url_service = |
1714 TemplateURLServiceFactory::GetForProfile(profile_); | 1707 TemplateURLServiceFactory::GetForProfile(profile_); |
1715 const TemplateURL* default_search_engine = | 1708 const TemplateURL* default_search_engine = |
1716 url_service->GetDefaultSearchProvider(); | 1709 url_service->GetDefaultSearchProvider(); |
1717 // The default engine can be NULL if the administrator has disabled | 1710 // The default engine can be NULL if the administrator has disabled |
1718 // default search. | 1711 // default search. |
(...skipping 105 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1824 if (base::win::GetVersion() <= base::win::VERSION_XP) | 1817 if (base::win::GetVersion() <= base::win::VERSION_XP) |
1825 uma_name += "_XP"; | 1818 uma_name += "_XP"; |
1826 | 1819 |
1827 uma_name += "_PreRead_"; | 1820 uma_name += "_PreRead_"; |
1828 uma_name += pre_read_percentage; | 1821 uma_name += pre_read_percentage; |
1829 AddPreReadHistogramTime(uma_name.c_str(), time); | 1822 AddPreReadHistogramTime(uma_name.c_str(), time); |
1830 } | 1823 } |
1831 #endif | 1824 #endif |
1832 #endif | 1825 #endif |
1833 } | 1826 } |
OLD | NEW |