Chromium Code Reviews| Index: chrome/browser/browser_process_impl.h |
| diff --git a/chrome/browser/browser_process_impl.h b/chrome/browser/browser_process_impl.h |
| index 92a7deb4d8ae1ee88ee27eb01d6c49540ac8e7de..0429f63d357f4ef5986c9ab56d2ec5a5bfaa1710 100644 |
| --- a/chrome/browser/browser_process_impl.h |
| +++ b/chrome/browser/browser_process_impl.h |
| @@ -20,6 +20,7 @@ |
| #include "base/scoped_ptr.h" |
| #include "chrome/browser/browser_process.h" |
| #include "chrome/browser/download/download_status_updater.h" |
| +#include "chrome/browser/net/pref_proxy_config_service.h" |
| #include "chrome/browser/prefs/pref_change_registrar.h" |
| #include "chrome/browser/tab_contents/thumbnail_generator.h" |
| #include "chrome/common/notification_observer.h" |
| @@ -33,8 +34,13 @@ class DevToolsProtocolHandler; |
| class FilePath; |
| class NotificationService; |
| class PluginDataRemover; |
| +class PrefProxyConfigTracker; |
| class TabCloseableStateWatcher; |
| +namespace net { |
| + class ProxyConfigService; |
|
willchan no longer on Chromium
2011/02/08 22:52:04
No indent
battre
2011/02/14 18:22:05
Done.
|
| +} // namespace net |
| + |
| // Real implementation of BrowserProcess that creates and returns the services. |
| class BrowserProcessImpl : public BrowserProcess, |
| public base::NonThreadSafe, |
| @@ -61,6 +67,8 @@ class BrowserProcessImpl : public BrowserProcess, |
| virtual DevToolsManager* devtools_manager(); |
| virtual SidebarManager* sidebar_manager(); |
| virtual ui::Clipboard* clipboard(); |
| + virtual PrefProxyConfigTracker* pref_proxy_config_tracker(); |
| + virtual URLRequestContextGetter* system_request_context(); |
| virtual NotificationUIManager* notification_ui_manager(); |
| virtual policy::ConfigurationPolicyProviderKeeper* |
| configuration_policy_provider_keeper(); |
| @@ -103,6 +111,8 @@ class BrowserProcessImpl : public BrowserProcess, |
| virtual void SetIPCLoggingEnabled(bool enable); |
| #endif |
| + virtual void InitSystemRequestContext(); |
| + |
| private: |
| void ClearLocalState(const FilePath& profile_path); |
| bool ShouldClearLocalState(FilePath* profile_path); |
| @@ -135,6 +145,8 @@ class BrowserProcessImpl : public BrowserProcess, |
| void CreateTabCloseableStateWatcher(); |
| void CreatePrintPreviewTabController(); |
| void CreateSafeBrowsingDetectionService(); |
| + void CreatePrefProxyConfigTracker(); |
| + void CreateSystemRequestContextGetter(); |
| bool IsSafeBrowsingDetectionServiceEnabled(); |
| @@ -212,6 +224,12 @@ class BrowserProcessImpl : public BrowserProcess, |
| scoped_ptr<safe_browsing::ClientSideDetectionService> |
| safe_browsing_detection_service_; |
| + bool created_pref_proxy_config_tracker_; |
| + scoped_refptr<PrefProxyConfigTracker> pref_proxy_config_tracker_; |
| + |
| + bool created_system_request_context_; |
| + scoped_refptr<URLRequestContextGetter> system_request_context_; |
| + |
| unsigned int module_ref_count_; |
| bool did_start_; |