| Index: chrome/browser/chromeos/chrome_browser_main_chromeos.cc
|
| diff --git a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
|
| index 96d3d41147709db79ba07115ffa620e0daa98ab6..dbddcbf5136cf7df5493854a68d53ca726d1a4a9 100644
|
| --- a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
|
| +++ b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
|
| @@ -30,9 +30,9 @@
|
| #include "chrome/browser/chromeos/app_mode/kiosk_mode_idle_app_name_notification.h"
|
| #include "chrome/browser/chromeos/boot_times_loader.h"
|
| #include "chrome/browser/chromeos/dbus/chrome_console_service_provider_delegate.h"
|
| +#include "chrome/browser/chromeos/dbus/chrome_proxy_resolver_delegate.h"
|
| #include "chrome/browser/chromeos/dbus/display_power_service_provider.h"
|
| #include "chrome/browser/chromeos/dbus/printer_service_provider.h"
|
| -#include "chrome/browser/chromeos/dbus/proxy_resolution_service_provider.h"
|
| #include "chrome/browser/chromeos/dbus/screen_lock_service_provider.h"
|
| #include "chrome/browser/chromeos/device/input_service_proxy.h"
|
| #include "chrome/browser/chromeos/events/event_rewriter.h"
|
| @@ -99,6 +99,7 @@
|
| #include "chromeos/dbus/services/console_service_provider.h"
|
| #include "chromeos/dbus/services/cros_dbus_service.h"
|
| #include "chromeos/dbus/services/liveness_service_provider.h"
|
| +#include "chromeos/dbus/services/proxy_resolution_service_provider.h"
|
| #include "chromeos/dbus/session_manager_client.h"
|
| #include "chromeos/disks/disk_mount_manager.h"
|
| #include "chromeos/ime/ime_keyboard.h"
|
| @@ -174,7 +175,8 @@ class DBusServices {
|
| DBusThreadManager::Get()->GetPowerManagerClient());
|
|
|
| ScopedVector<CrosDBusService::ServiceProviderInterface> service_providers;
|
| - service_providers.push_back(ProxyResolutionServiceProvider::Create());
|
| + service_providers.push_back(ProxyResolutionServiceProvider::Create(
|
| + make_scoped_ptr(new ChromeProxyResolverDelegate())));
|
| #if !defined(USE_ATHENA)
|
| // crbug.com/413897
|
| service_providers.push_back(new DisplayPowerServiceProvider);
|
|
|