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

Side by Side Diff: chrome/browser/chromeos/chrome_browser_main_chromeos.cc

Issue 2775503002: chromeos:: Remove pointless ProxyResolverInterface. (Closed)
Patch Set: fix typo in existing comment Created 3 years, 9 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
OLDNEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 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/chromeos/chrome_browser_main_chromeos.h" 5 #include "chrome/browser/chromeos/chrome_browser_main_chromeos.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include <string> 9 #include <string>
10 #include <utility> 10 #include <utility>
(...skipping 21 matching lines...) Expand all
32 #include "chrome/browser/chromeos/accessibility/magnification_manager.h" 32 #include "chrome/browser/chromeos/accessibility/magnification_manager.h"
33 #include "chrome/browser/chromeos/accessibility/spoken_feedback_event_rewriter.h " 33 #include "chrome/browser/chromeos/accessibility/spoken_feedback_event_rewriter.h "
34 #include "chrome/browser/chromeos/app_mode/arc/arc_kiosk_app_manager.h" 34 #include "chrome/browser/chromeos/app_mode/arc/arc_kiosk_app_manager.h"
35 #include "chrome/browser/chromeos/app_mode/kiosk_app_launch_error.h" 35 #include "chrome/browser/chromeos/app_mode/kiosk_app_launch_error.h"
36 #include "chrome/browser/chromeos/app_mode/kiosk_app_manager.h" 36 #include "chrome/browser/chromeos/app_mode/kiosk_app_manager.h"
37 #include "chrome/browser/chromeos/app_mode/kiosk_mode_idle_app_name_notification .h" 37 #include "chrome/browser/chromeos/app_mode/kiosk_mode_idle_app_name_notification .h"
38 #include "chrome/browser/chromeos/arc/arc_service_launcher.h" 38 #include "chrome/browser/chromeos/arc/arc_service_launcher.h"
39 #include "chrome/browser/chromeos/boot_times_recorder.h" 39 #include "chrome/browser/chromeos/boot_times_recorder.h"
40 #include "chrome/browser/chromeos/dbus/chrome_console_service_provider_delegate. h" 40 #include "chrome/browser/chromeos/dbus/chrome_console_service_provider_delegate. h"
41 #include "chrome/browser/chromeos/dbus/chrome_display_power_service_provider_del egate.h" 41 #include "chrome/browser/chromeos/dbus/chrome_display_power_service_provider_del egate.h"
42 #include "chrome/browser/chromeos/dbus/chrome_proxy_resolver_delegate.h" 42 #include "chrome/browser/chromeos/dbus/chrome_proxy_resolution_service_provider_ delegate.h"
43 #include "chrome/browser/chromeos/dbus/kiosk_info_service_provider.h" 43 #include "chrome/browser/chromeos/dbus/kiosk_info_service_provider.h"
44 #include "chrome/browser/chromeos/dbus/mus_console_service_provider_delegate.h" 44 #include "chrome/browser/chromeos/dbus/mus_console_service_provider_delegate.h"
45 #include "chrome/browser/chromeos/dbus/screen_lock_service_provider.h" 45 #include "chrome/browser/chromeos/dbus/screen_lock_service_provider.h"
46 #include "chrome/browser/chromeos/display/quirks_manager_delegate_impl.h" 46 #include "chrome/browser/chromeos/display/quirks_manager_delegate_impl.h"
47 #include "chrome/browser/chromeos/events/event_rewriter_controller.h" 47 #include "chrome/browser/chromeos/events/event_rewriter_controller.h"
48 #include "chrome/browser/chromeos/events/event_rewriter_delegate_impl.h" 48 #include "chrome/browser/chromeos/events/event_rewriter_delegate_impl.h"
49 #include "chrome/browser/chromeos/events/keyboard_driven_event_rewriter.h" 49 #include "chrome/browser/chromeos/events/keyboard_driven_event_rewriter.h"
50 #include "chrome/browser/chromeos/extensions/default_app_order.h" 50 #include "chrome/browser/chromeos/extensions/default_app_order.h"
51 #include "chrome/browser/chromeos/extensions/extension_volume_observer.h" 51 #include "chrome/browser/chromeos/extensions/extension_volume_observer.h"
52 #include "chrome/browser/chromeos/external_metrics.h" 52 #include "chrome/browser/chromeos/external_metrics.h"
(...skipping 173 matching lines...) Expand 10 before | Expand all | Expand 10 after
226 226
227 bluez::BluezDBusManager::Initialize( 227 bluez::BluezDBusManager::Initialize(
228 DBusThreadManager::Get()->GetSystemBus(), 228 DBusThreadManager::Get()->GetSystemBus(),
229 chromeos::DBusThreadManager::Get()->IsUsingFakes()); 229 chromeos::DBusThreadManager::Get()->IsUsingFakes());
230 230
231 PowerPolicyController::Initialize( 231 PowerPolicyController::Initialize(
232 DBusThreadManager::Get()->GetPowerManagerClient()); 232 DBusThreadManager::Get()->GetPowerManagerClient());
233 233
234 CrosDBusService::ServiceProviderList service_providers; 234 CrosDBusService::ServiceProviderList service_providers;
235 service_providers.push_back( 235 service_providers.push_back(
236 base::WrapUnique(ProxyResolutionServiceProvider::Create( 236 base::MakeUnique<ProxyResolutionServiceProvider>(
237 base::MakeUnique<ChromeProxyResolverDelegate>()))); 237 base::MakeUnique<ChromeProxyResolutionServiceProviderDelegate>()));
238 if (!ash_util::IsRunningInMash()) { 238 if (!ash_util::IsRunningInMash()) {
239 // TODO(crbug.com/629707): revisit this with mustash dbus work. 239 // TODO(crbug.com/629707): revisit this with mustash dbus work.
240 service_providers.push_back(base::MakeUnique<DisplayPowerServiceProvider>( 240 service_providers.push_back(base::MakeUnique<DisplayPowerServiceProvider>(
241 base::MakeUnique<ChromeDisplayPowerServiceProviderDelegate>())); 241 base::MakeUnique<ChromeDisplayPowerServiceProviderDelegate>()));
242 } 242 }
243 service_providers.push_back(base::MakeUnique<LivenessServiceProvider>()); 243 service_providers.push_back(base::MakeUnique<LivenessServiceProvider>());
244 service_providers.push_back(base::MakeUnique<ScreenLockServiceProvider>()); 244 service_providers.push_back(base::MakeUnique<ScreenLockServiceProvider>());
245 if (ash_util::IsRunningInMash()) { 245 if (ash_util::IsRunningInMash()) {
246 service_providers.push_back(base::MakeUnique<ConsoleServiceProvider>( 246 service_providers.push_back(base::MakeUnique<ConsoleServiceProvider>(
247 base::MakeUnique<MusConsoleServiceProviderDelegate>())); 247 base::MakeUnique<MusConsoleServiceProviderDelegate>()));
(...skipping 714 matching lines...) Expand 10 before | Expand all | Expand 10 after
962 962
963 ChromeBrowserMainPartsLinux::PostDestroyThreads(); 963 ChromeBrowserMainPartsLinux::PostDestroyThreads();
964 964
965 // Destroy DeviceSettingsService after g_browser_process. 965 // Destroy DeviceSettingsService after g_browser_process.
966 DeviceSettingsService::Shutdown(); 966 DeviceSettingsService::Shutdown();
967 967
968 chromeos::ShutdownCloseTracking(); 968 chromeos::ShutdownCloseTracking();
969 } 969 }
970 970
971 } // namespace chromeos 971 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698