| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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/browser_main.h" | 5 #include "chrome/browser/browser_main.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 #include <string> | 8 #include <string> |
| 9 #include <vector> | 9 #include <vector> |
| 10 | 10 |
| (...skipping 1684 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1695 local_state, | 1695 local_state, |
| 1696 preconnect_enabled); | 1696 preconnect_enabled); |
| 1697 | 1697 |
| 1698 #if defined(OS_WIN) | 1698 #if defined(OS_WIN) |
| 1699 app::win::ScopedCOMInitializer com_initializer; | 1699 app::win::ScopedCOMInitializer com_initializer; |
| 1700 | 1700 |
| 1701 #if defined(GOOGLE_CHROME_BUILD) | 1701 #if defined(GOOGLE_CHROME_BUILD) |
| 1702 // Init the RLZ library. This just binds the dll and schedules a task on the | 1702 // Init the RLZ library. This just binds the dll and schedules a task on the |
| 1703 // file thread to be run sometime later. If this is the first run we record | 1703 // file thread to be run sometime later. If this is the first run we record |
| 1704 // the installation event. | 1704 // the installation event. |
| 1705 RLZTracker::InitRlzDelayed(is_first_run, master_prefs.ping_delay); | 1705 bool google_search_default = false; |
| 1706 const TemplateURL* url_template = |
| 1707 profile->GetTemplateURLModel()->GetDefaultSearchProvider(); |
| 1708 if (url_template) { |
| 1709 const TemplateURLRef* urlref = url_template->url(); |
| 1710 if (urlref) { |
| 1711 google_search_default = urlref->HasGoogleBaseURLs(); |
| 1712 } |
| 1713 } |
| 1714 RLZTracker::InitRlzDelayed(is_first_run, master_prefs.ping_delay, |
| 1715 google_search_default); |
| 1706 #endif // GOOGLE_CHROME_BUILD | 1716 #endif // GOOGLE_CHROME_BUILD |
| 1707 #endif // OS_WIN | 1717 #endif // OS_WIN |
| 1708 | 1718 |
| 1709 // Configure modules that need access to resources. | 1719 // Configure modules that need access to resources. |
| 1710 net::NetModule::SetResourceProvider(chrome_common_net::NetResourceProvider); | 1720 net::NetModule::SetResourceProvider(chrome_common_net::NetResourceProvider); |
| 1711 | 1721 |
| 1712 // In unittest mode, this will do nothing. In normal mode, this will create | 1722 // In unittest mode, this will do nothing. In normal mode, this will create |
| 1713 // the global GoogleURLTracker and IntranetRedirectDetector instances, which | 1723 // the global GoogleURLTracker and IntranetRedirectDetector instances, which |
| 1714 // will promptly go to sleep for five and seven seconds, respectively (to | 1724 // will promptly go to sleep for five and seven seconds, respectively (to |
| 1715 // avoid slowing startup), and wake up afterwards to see if they should do | 1725 // avoid slowing startup), and wake up afterwards to see if they should do |
| (...skipping 254 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1970 #if defined(OS_CHROMEOS) | 1980 #if defined(OS_CHROMEOS) |
| 1971 // To be precise, logout (browser shutdown) is not yet done, but the | 1981 // To be precise, logout (browser shutdown) is not yet done, but the |
| 1972 // remaining work is negligible, hence we say LogoutDone here. | 1982 // remaining work is negligible, hence we say LogoutDone here. |
| 1973 chromeos::BootTimesLoader::Get()->AddLogoutTimeMarker("LogoutDone", | 1983 chromeos::BootTimesLoader::Get()->AddLogoutTimeMarker("LogoutDone", |
| 1974 false); | 1984 false); |
| 1975 chromeos::BootTimesLoader::Get()->WriteLogoutTimes(); | 1985 chromeos::BootTimesLoader::Get()->WriteLogoutTimes(); |
| 1976 #endif | 1986 #endif |
| 1977 TRACE_EVENT_END_ETW("BrowserMain", 0, 0); | 1987 TRACE_EVENT_END_ETW("BrowserMain", 0, 0); |
| 1978 return result_code; | 1988 return result_code; |
| 1979 } | 1989 } |
| OLD | NEW |