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

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

Issue 18175: Change chrome:// to chrome-ui://, fix up one chrome-resource:// reference. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 11 years, 10 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 | « chrome/browser/browser_about_handler.cc ('k') | chrome/browser/browser_url_handler.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) 2006-2008 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2006-2008 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 "build/build_config.h" 5 #include "build/build_config.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/field_trial.h" 10 #include "base/field_trial.h"
(...skipping 428 matching lines...) Expand 10 before | Expand all | Expand 10 after
439 win_util::ScopedCOMInitializer com_initializer; 439 win_util::ScopedCOMInitializer com_initializer;
440 440
441 // Init the RLZ library. This just binds the dll and schedules a task on the 441 // Init the RLZ library. This just binds the dll and schedules a task on the
442 // file thread to be run sometime later. If this is the first run we record 442 // file thread to be run sometime later. If this is the first run we record
443 // the installation event. 443 // the installation event.
444 RLZTracker::InitRlzDelayed(base::DIR_MODULE, is_first_run); 444 RLZTracker::InitRlzDelayed(base::DIR_MODULE, is_first_run);
445 445
446 // Config the network module so it has access to resources. 446 // Config the network module so it has access to resources.
447 net::NetModule::SetResourceProvider(NetResourceProvider); 447 net::NetModule::SetResourceProvider(NetResourceProvider);
448 448
449 // Register our global network handler for chrome:// and chrome-extension:// 449 // Register our global network handler for chrome-ui:// and
450 // URLs. 450 // chrome-extension:// URLs.
451 RegisterURLRequestChromeJob(); 451 RegisterURLRequestChromeJob();
452 RegisterExtensionProtocols(); 452 RegisterExtensionProtocols();
453 453
454 sandbox::BrokerServices* broker_services = 454 sandbox::BrokerServices* broker_services =
455 parameters.sandbox_info_.BrokerServices(); 455 parameters.sandbox_info_.BrokerServices();
456 browser_process->InitBrokerServices(broker_services); 456 browser_process->InitBrokerServices(broker_services);
457 #endif 457 #endif
458 458
459 // In unittest mode, this will do nothing. In normal mode, this will create 459 // In unittest mode, this will do nothing. In normal mode, this will create
460 // the global GoogleURLTracker instance, which will promptly go to sleep for 460 // the global GoogleURLTracker instance, which will promptly go to sleep for
(...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after
538 if (metrics) 538 if (metrics)
539 metrics->Stop(); 539 metrics->Stop();
540 540
541 // browser_shutdown takes care of deleting browser_process, so we need to 541 // browser_shutdown takes care of deleting browser_process, so we need to
542 // release it. 542 // release it.
543 browser_process.release(); 543 browser_process.release();
544 browser_shutdown::Shutdown(); 544 browser_shutdown::Shutdown();
545 545
546 return result_code; 546 return result_code;
547 } 547 }
OLDNEW
« no previous file with comments | « chrome/browser/browser_about_handler.cc ('k') | chrome/browser/browser_url_handler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698