OLD | NEW |
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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 1176 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1187 user_prefs, | 1187 user_prefs, |
1188 local_state, | 1188 local_state, |
1189 parsed_command_line.HasSwitch(switches::kEnablePreconnect)); | 1189 parsed_command_line.HasSwitch(switches::kEnablePreconnect)); |
1190 | 1190 |
1191 #if defined(OS_WIN) | 1191 #if defined(OS_WIN) |
1192 win_util::ScopedCOMInitializer com_initializer; | 1192 win_util::ScopedCOMInitializer com_initializer; |
1193 | 1193 |
1194 // Init the RLZ library. This just binds the dll and schedules a task on the | 1194 // Init the RLZ library. This just binds the dll and schedules a task on the |
1195 // file thread to be run sometime later. If this is the first run we record | 1195 // file thread to be run sometime later. If this is the first run we record |
1196 // the installation event. | 1196 // the installation event. |
1197 RLZTracker::InitRlzDelayed(base::DIR_MODULE, is_first_run, | 1197 RLZTracker::InitRlzDelayed(is_first_run, master_prefs.ping_delay); |
1198 master_prefs.ping_delay); | |
1199 #endif | 1198 #endif |
1200 | 1199 |
1201 // Configure the network module so it has access to resources. | 1200 // Configure the network module so it has access to resources. |
1202 net::NetModule::SetResourceProvider(chrome_common_net::NetResourceProvider); | 1201 net::NetModule::SetResourceProvider(chrome_common_net::NetResourceProvider); |
1203 | 1202 |
1204 // Register our global network handler for chrome:// and | 1203 // Register our global network handler for chrome:// and |
1205 // chrome-extension:// URLs. | 1204 // chrome-extension:// URLs. |
1206 RegisterURLRequestChromeJob(); | 1205 RegisterURLRequestChromeJob(); |
1207 RegisterExtensionProtocols(); | 1206 RegisterExtensionProtocols(); |
1208 RegisterMetadataURLRequestHandler(); | 1207 RegisterMetadataURLRequestHandler(); |
(...skipping 144 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1353 | 1352 |
1354 metrics->Stop(); | 1353 metrics->Stop(); |
1355 | 1354 |
1356 // browser_shutdown takes care of deleting browser_process, so we need to | 1355 // browser_shutdown takes care of deleting browser_process, so we need to |
1357 // release it. | 1356 // release it. |
1358 ignore_result(browser_process.release()); | 1357 ignore_result(browser_process.release()); |
1359 browser_shutdown::Shutdown(); | 1358 browser_shutdown::Shutdown(); |
1360 | 1359 |
1361 return result_code; | 1360 return result_code; |
1362 } | 1361 } |
OLD | NEW |