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

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

Issue 3146007: Fix for issue 51693, which was a regression from integrating the open source... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 10 years, 4 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | chrome/browser/browser_shutdown.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 1244 matching lines...) Expand 10 before | Expand all | Expand 10 after
1255 preconnect_enabled = true; 1255 preconnect_enabled = true;
1256 chrome_browser_net::PredictorInit dns_prefetch( 1256 chrome_browser_net::PredictorInit dns_prefetch(
1257 user_prefs, 1257 user_prefs,
1258 local_state, 1258 local_state,
1259 preconnect_enabled, 1259 preconnect_enabled,
1260 parsed_command_line.HasSwitch(switches::kPreconnectDespiteProxy)); 1260 parsed_command_line.HasSwitch(switches::kPreconnectDespiteProxy));
1261 1261
1262 #if defined(OS_WIN) 1262 #if defined(OS_WIN)
1263 win_util::ScopedCOMInitializer com_initializer; 1263 win_util::ScopedCOMInitializer com_initializer;
1264 1264
1265 #if defined(GOOGLE_CHROME_BUILD)
1265 // Init the RLZ library. This just binds the dll and schedules a task on the 1266 // Init the RLZ library. This just binds the dll and schedules a task on the
1266 // file thread to be run sometime later. If this is the first run we record 1267 // file thread to be run sometime later. If this is the first run we record
1267 // the installation event. 1268 // the installation event.
1268 RLZTracker::InitRlzDelayed(is_first_run, master_prefs.ping_delay); 1269 RLZTracker::InitRlzDelayed(is_first_run, master_prefs.ping_delay);
1269 #endif 1270 #endif
1271 #endif
1270 1272
1271 // Configure the network module so it has access to resources. 1273 // Configure the network module so it has access to resources.
1272 net::NetModule::SetResourceProvider(chrome_common_net::NetResourceProvider); 1274 net::NetModule::SetResourceProvider(chrome_common_net::NetResourceProvider);
1273 1275
1274 // Register our global network handler for chrome:// and 1276 // Register our global network handler for chrome:// and
1275 // chrome-extension:// URLs. 1277 // chrome-extension:// URLs.
1276 RegisterURLRequestChromeJob(); 1278 RegisterURLRequestChromeJob();
1277 RegisterExtensionProtocols(); 1279 RegisterExtensionProtocols();
1278 RegisterMetadataURLRequestHandler(); 1280 RegisterMetadataURLRequestHandler();
1279 1281
(...skipping 167 matching lines...) Expand 10 before | Expand all | Expand 10 after
1447 metrics->Stop(); 1449 metrics->Stop();
1448 1450
1449 // browser_shutdown takes care of deleting browser_process, so we need to 1451 // browser_shutdown takes care of deleting browser_process, so we need to
1450 // release it. 1452 // release it.
1451 ignore_result(browser_process.release()); 1453 ignore_result(browser_process.release());
1452 browser_shutdown::Shutdown(); 1454 browser_shutdown::Shutdown();
1453 1455
1454 TRACE_EVENT_END("BrowserMain", 0, 0); 1456 TRACE_EVENT_END("BrowserMain", 0, 0);
1455 return result_code; 1457 return result_code;
1456 } 1458 }
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/browser_shutdown.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698