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

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

Issue 7465107: Fix broken tree (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 9 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 | no next file » | 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) 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_process_impl.h" 5 #include "chrome/browser/browser_process_impl.h"
6 6
7 #include <map> 7 #include <map>
8 #include <set> 8 #include <set>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 675 matching lines...) Expand 10 before | Expand all | Expand 10 after
686 if (!component_updater_.get()) { 686 if (!component_updater_.get()) {
687 ComponentUpdateService::Configurator* configurator = 687 ComponentUpdateService::Configurator* configurator =
688 MakeChromeComponentUpdaterConfigurator( 688 MakeChromeComponentUpdaterConfigurator(
689 CommandLine::ForCurrentProcess(), 689 CommandLine::ForCurrentProcess(),
690 io_thread()->system_url_request_context_getter()); 690 io_thread()->system_url_request_context_getter());
691 // Creating the component updater does not do anything, components 691 // Creating the component updater does not do anything, components
692 // need to be registered and Start() needs to be called. 692 // need to be registered and Start() needs to be called.
693 component_updater_.reset(ComponentUpdateServiceFactory(configurator)); 693 component_updater_.reset(ComponentUpdateServiceFactory(configurator));
694 } 694 }
695 return component_updater_.get(); 695 return component_updater_.get();
696 #endif
696 } 697 }
697 #endif
698 698
699 void BrowserProcessImpl::CreateResourceDispatcherHost() { 699 void BrowserProcessImpl::CreateResourceDispatcherHost() {
700 DCHECK(!created_resource_dispatcher_host_ && 700 DCHECK(!created_resource_dispatcher_host_ &&
701 resource_dispatcher_host_.get() == NULL); 701 resource_dispatcher_host_.get() == NULL);
702 created_resource_dispatcher_host_ = true; 702 created_resource_dispatcher_host_ = true;
703 703
704 // UserScriptListener will delete itself. 704 // UserScriptListener will delete itself.
705 ResourceQueue::DelegateSet resource_queue_delegates; 705 ResourceQueue::DelegateSet resource_queue_delegates;
706 resource_queue_delegates.insert(new UserScriptListener()); 706 resource_queue_delegates.insert(new UserScriptListener());
707 707
(...skipping 410 matching lines...) Expand 10 before | Expand all | Expand 10 after
1118 } 1118 }
1119 1119
1120 void BrowserProcessImpl::OnAutoupdateTimer() { 1120 void BrowserProcessImpl::OnAutoupdateTimer() {
1121 if (CanAutorestartForUpdate()) { 1121 if (CanAutorestartForUpdate()) {
1122 DLOG(WARNING) << "Detected update. Restarting browser."; 1122 DLOG(WARNING) << "Detected update. Restarting browser.";
1123 RestartPersistentInstance(); 1123 RestartPersistentInstance();
1124 } 1124 }
1125 } 1125 }
1126 1126
1127 #endif // (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) 1127 #endif // (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698