| Index: chrome/browser/browser_process_impl.cc
|
| diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_process_impl.cc
|
| index b7d11153c96e25d69122fe0994347bb4ffdfdf4f..fb568bbe3774ac3bb4b1f183a7a22e1d4df7e176 100644
|
| --- a/chrome/browser/browser_process_impl.cc
|
| +++ b/chrome/browser/browser_process_impl.cc
|
| @@ -57,6 +57,7 @@
|
| #include "chrome/common/extensions/extension_resource.h"
|
| #include "chrome/common/extensions/extension_l10n_util.h"
|
| #include "chrome/common/json_pref_store.h"
|
| +#include "chrome/common/net/url_request_context_getter.h"
|
| #include "chrome/common/notification_service.h"
|
| #include "chrome/common/pref_names.h"
|
| #include "chrome/common/url_constants.h"
|
| @@ -76,6 +77,10 @@
|
| #include "chrome/common/render_messages.h"
|
| #endif
|
|
|
| +#if defined(OS_CHROMEOS)
|
| +#include "chrome/browser/chromeos/proxy_config_service_impl.h"
|
| +#endif // defined(OS_CHROMEOS)
|
| +
|
| #if (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)
|
| // How often to check if the persistent instance of Chrome needs to restart
|
| // to install an update.
|
| @@ -423,6 +428,23 @@ ui::Clipboard* BrowserProcessImpl::clipboard() {
|
| return clipboard_.get();
|
| }
|
|
|
| +scoped_refptr<URLRequestContextGetter>
|
| +BrowserProcessImpl::system_request_context() {
|
| + DCHECK(CalledOnValidThread());
|
| + return io_thread()->system_url_request_context_getter();
|
| +}
|
| +
|
| +#if defined(OS_CHROMEOS)
|
| +chromeos::ProxyConfigServiceImpl*
|
| +BrowserProcessImpl::chromeos_proxy_config_service_impl() {
|
| + if (!chromeos_proxy_config_service_impl_) {
|
| + chromeos_proxy_config_service_impl_ =
|
| + new chromeos::ProxyConfigServiceImpl();
|
| + }
|
| + return chromeos_proxy_config_service_impl_;
|
| +}
|
| +#endif // defined(OS_CHROMEOS)
|
| +
|
| NotificationUIManager* BrowserProcessImpl::notification_ui_manager() {
|
| DCHECK(CalledOnValidThread());
|
| if (!created_notification_ui_manager_)
|
|
|