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

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

Issue 8205001: (Owner approval for) Delay network requests on startup if any webRequest ... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 9 years, 2 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
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
11 #include "base/command_line.h" 11 #include "base/command_line.h"
12 #include "base/file_util.h" 12 #include "base/file_util.h"
13 #include "base/path_service.h" 13 #include "base/path_service.h"
14 #include "base/synchronization/waitable_event.h" 14 #include "base/synchronization/waitable_event.h"
15 #include "base/task.h" 15 #include "base/task.h"
16 #include "base/threading/thread.h" 16 #include "base/threading/thread.h"
17 #include "base/threading/thread_restrictions.h" 17 #include "base/threading/thread_restrictions.h"
18 #include "chrome/browser/automation/automation_provider_list.h" 18 #include "chrome/browser/automation/automation_provider_list.h"
19 #include "chrome/browser/background/background_mode_manager.h" 19 #include "chrome/browser/background/background_mode_manager.h"
20 #include "chrome/browser/chrome_browser_main.h" 20 #include "chrome/browser/chrome_browser_main.h"
21 #include "chrome/browser/browser_trial.h" 21 #include "chrome/browser/browser_trial.h"
22 #include "chrome/browser/chrome_plugin_service_filter.h" 22 #include "chrome/browser/chrome_plugin_service_filter.h"
23 #include "chrome/browser/component_updater/component_updater_configurator.h" 23 #include "chrome/browser/component_updater/component_updater_configurator.h"
24 #include "chrome/browser/component_updater/component_updater_service.h" 24 #include "chrome/browser/component_updater/component_updater_service.h"
25 #include "chrome/browser/debugger/devtools_protocol_handler.h" 25 #include "chrome/browser/debugger/devtools_protocol_handler.h"
26 #include "chrome/browser/debugger/remote_debugging_server.h" 26 #include "chrome/browser/debugger/remote_debugging_server.h"
27 #include "chrome/browser/download/download_request_limiter.h" 27 #include "chrome/browser/download/download_request_limiter.h"
28 #include "chrome/browser/extensions/extension_event_router_forwarder.h" 28 #include "chrome/browser/extensions/extension_event_router_forwarder.h"
29 #include "chrome/browser/extensions/extension_tab_id_map.h" 29 #include "chrome/browser/extensions/extension_tab_id_map.h"
30 #include "chrome/browser/extensions/network_delay_listener.h"
30 #include "chrome/browser/extensions/user_script_listener.h" 31 #include "chrome/browser/extensions/user_script_listener.h"
31 #include "chrome/browser/first_run/upgrade_util.h" 32 #include "chrome/browser/first_run/upgrade_util.h"
32 #include "chrome/browser/google/google_url_tracker.h" 33 #include "chrome/browser/google/google_url_tracker.h"
33 #include "chrome/browser/icon_manager.h" 34 #include "chrome/browser/icon_manager.h"
34 #include "chrome/browser/intranet_redirect_detector.h" 35 #include "chrome/browser/intranet_redirect_detector.h"
35 #include "chrome/browser/io_thread.h" 36 #include "chrome/browser/io_thread.h"
36 #include "chrome/browser/metrics/metrics_service.h" 37 #include "chrome/browser/metrics/metrics_service.h"
37 #include "chrome/browser/metrics/thread_watcher.h" 38 #include "chrome/browser/metrics/thread_watcher.h"
38 #include "chrome/browser/net/chrome_net_log.h" 39 #include "chrome/browser/net/chrome_net_log.h"
39 #include "chrome/browser/net/crl_set_fetcher.h" 40 #include "chrome/browser/net/crl_set_fetcher.h"
(...skipping 715 matching lines...) Expand 10 before | Expand all | Expand 10 after
755 } 756 }
756 return crl_set_fetcher_.get(); 757 return crl_set_fetcher_.get();
757 #endif 758 #endif
758 } 759 }
759 760
760 void BrowserProcessImpl::CreateResourceDispatcherHost() { 761 void BrowserProcessImpl::CreateResourceDispatcherHost() {
761 DCHECK(!created_resource_dispatcher_host_ && 762 DCHECK(!created_resource_dispatcher_host_ &&
762 resource_dispatcher_host_.get() == NULL); 763 resource_dispatcher_host_.get() == NULL);
763 created_resource_dispatcher_host_ = true; 764 created_resource_dispatcher_host_ = true;
764 765
765 // UserScriptListener will delete itself. 766 // UserScriptListener and NetworkDelayListener will delete themselves.
766 ResourceQueue::DelegateSet resource_queue_delegates; 767 ResourceQueue::DelegateSet resource_queue_delegates;
767 resource_queue_delegates.insert(new UserScriptListener()); 768 resource_queue_delegates.insert(new UserScriptListener());
769 resource_queue_delegates.insert(new NetworkDelayListener());
768 770
769 resource_dispatcher_host_.reset( 771 resource_dispatcher_host_.reset(
770 new ResourceDispatcherHost(resource_queue_delegates)); 772 new ResourceDispatcherHost(resource_queue_delegates));
771 resource_dispatcher_host_->Initialize(); 773 resource_dispatcher_host_->Initialize();
772 774
773 resource_dispatcher_host_delegate_.reset( 775 resource_dispatcher_host_delegate_.reset(
774 new ChromeResourceDispatcherHostDelegate(resource_dispatcher_host_.get(), 776 new ChromeResourceDispatcherHostDelegate(resource_dispatcher_host_.get(),
775 prerender_tracker())); 777 prerender_tracker()));
776 resource_dispatcher_host_->set_delegate( 778 resource_dispatcher_host_->set_delegate(
777 resource_dispatcher_host_delegate_.get()); 779 resource_dispatcher_host_delegate_.get());
(...skipping 376 matching lines...) Expand 10 before | Expand all | Expand 10 after
1154 } 1156 }
1155 1157
1156 void BrowserProcessImpl::OnAutoupdateTimer() { 1158 void BrowserProcessImpl::OnAutoupdateTimer() {
1157 if (CanAutorestartForUpdate()) { 1159 if (CanAutorestartForUpdate()) {
1158 DLOG(WARNING) << "Detected update. Restarting browser."; 1160 DLOG(WARNING) << "Detected update. Restarting browser.";
1159 RestartPersistentInstance(); 1161 RestartPersistentInstance();
1160 } 1162 }
1161 } 1163 }
1162 1164
1163 #endif // (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) 1165 #endif // (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698