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

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

Issue 101026: Change chrome-ui to chrome. I didn't go too far in converting existing string... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 11 years, 7 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 "app/resource_bundle.h" 9 #include "app/resource_bundle.h"
10 #include "base/command_line.h" 10 #include "base/command_line.h"
(...skipping 501 matching lines...) Expand 10 before | Expand all | Expand 10 after
512 512
513 // Init the RLZ library. This just binds the dll and schedules a task on the 513 // Init the RLZ library. This just binds the dll and schedules a task on the
514 // file thread to be run sometime later. If this is the first run we record 514 // file thread to be run sometime later. If this is the first run we record
515 // the installation event. 515 // the installation event.
516 RLZTracker::InitRlzDelayed(base::DIR_MODULE, is_first_run); 516 RLZTracker::InitRlzDelayed(base::DIR_MODULE, is_first_run);
517 #endif 517 #endif
518 518
519 // Config the network module so it has access to resources. 519 // Config the network module so it has access to resources.
520 net::NetModule::SetResourceProvider(NetResourceProvider); 520 net::NetModule::SetResourceProvider(NetResourceProvider);
521 521
522 // Register our global network handler for chrome-ui:// and 522 // Register our global network handler for chrome:// and
523 // chrome-extension:// URLs. 523 // chrome-extension:// URLs.
524 RegisterURLRequestChromeJob(); 524 RegisterURLRequestChromeJob();
525 525
526 #if defined(OS_WIN) 526 #if defined(OS_WIN)
527 RegisterExtensionProtocols(); 527 RegisterExtensionProtocols();
528 528
529 sandbox::BrokerServices* broker_services = 529 sandbox::BrokerServices* broker_services =
530 parameters.sandbox_info_.BrokerServices(); 530 parameters.sandbox_info_.BrokerServices();
531 if (broker_services) 531 if (broker_services)
532 browser_process->InitBrokerServices(broker_services); 532 browser_process->InitBrokerServices(broker_services);
(...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after
630 if (metrics) 630 if (metrics)
631 metrics->Stop(); 631 metrics->Stop();
632 632
633 // browser_shutdown takes care of deleting browser_process, so we need to 633 // browser_shutdown takes care of deleting browser_process, so we need to
634 // release it. 634 // release it.
635 browser_process.release(); 635 browser_process.release();
636 browser_shutdown::Shutdown(); 636 browser_shutdown::Shutdown();
637 637
638 return result_code; 638 return result_code;
639 } 639 }
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