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

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

Issue 1394573003: chromeos: Add SurfaceServiceProvider. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 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
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 <string> 7 #include <string>
8 #include <vector> 8 #include <vector>
9 9
10 #include "ash/ash_switches.h" 10 #include "ash/ash_switches.h"
(...skipping 16 matching lines...) Expand all
27 #include "chrome/browser/chromeos/accessibility/accessibility_manager.h" 27 #include "chrome/browser/chromeos/accessibility/accessibility_manager.h"
28 #include "chrome/browser/chromeos/accessibility/magnification_manager.h" 28 #include "chrome/browser/chromeos/accessibility/magnification_manager.h"
29 #include "chrome/browser/chromeos/accessibility/spoken_feedback_event_rewriter.h " 29 #include "chrome/browser/chromeos/accessibility/spoken_feedback_event_rewriter.h "
30 #include "chrome/browser/chromeos/app_mode/kiosk_app_launch_error.h" 30 #include "chrome/browser/chromeos/app_mode/kiosk_app_launch_error.h"
31 #include "chrome/browser/chromeos/app_mode/kiosk_app_manager.h" 31 #include "chrome/browser/chromeos/app_mode/kiosk_app_manager.h"
32 #include "chrome/browser/chromeos/app_mode/kiosk_mode_idle_app_name_notification .h" 32 #include "chrome/browser/chromeos/app_mode/kiosk_mode_idle_app_name_notification .h"
33 #include "chrome/browser/chromeos/boot_times_recorder.h" 33 #include "chrome/browser/chromeos/boot_times_recorder.h"
34 #include "chrome/browser/chromeos/dbus/chrome_console_service_provider_delegate. h" 34 #include "chrome/browser/chromeos/dbus/chrome_console_service_provider_delegate. h"
35 #include "chrome/browser/chromeos/dbus/chrome_display_power_service_provider_del egate.h" 35 #include "chrome/browser/chromeos/dbus/chrome_display_power_service_provider_del egate.h"
36 #include "chrome/browser/chromeos/dbus/chrome_proxy_resolver_delegate.h" 36 #include "chrome/browser/chromeos/dbus/chrome_proxy_resolver_delegate.h"
37 #include "chrome/browser/chromeos/dbus/chrome_surface_service_provider_delegate. h"
37 #include "chrome/browser/chromeos/dbus/screen_lock_service_provider.h" 38 #include "chrome/browser/chromeos/dbus/screen_lock_service_provider.h"
38 #include "chrome/browser/chromeos/events/event_rewriter.h" 39 #include "chrome/browser/chromeos/events/event_rewriter.h"
39 #include "chrome/browser/chromeos/events/event_rewriter_controller.h" 40 #include "chrome/browser/chromeos/events/event_rewriter_controller.h"
40 #include "chrome/browser/chromeos/events/keyboard_driven_event_rewriter.h" 41 #include "chrome/browser/chromeos/events/keyboard_driven_event_rewriter.h"
41 #include "chrome/browser/chromeos/extensions/default_app_order.h" 42 #include "chrome/browser/chromeos/extensions/default_app_order.h"
42 #include "chrome/browser/chromeos/external_metrics.h" 43 #include "chrome/browser/chromeos/external_metrics.h"
43 #include "chrome/browser/chromeos/input_method/input_method_configuration.h" 44 #include "chrome/browser/chromeos/input_method/input_method_configuration.h"
44 #include "chrome/browser/chromeos/input_method/input_method_util.h" 45 #include "chrome/browser/chromeos/input_method/input_method_util.h"
45 #include "chrome/browser/chromeos/language_preferences.h" 46 #include "chrome/browser/chromeos/language_preferences.h"
46 #include "chrome/browser/chromeos/login/helper.h" 47 #include "chrome/browser/chromeos/login/helper.h"
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
90 #include "chromeos/cryptohome/async_method_caller.h" 91 #include "chromeos/cryptohome/async_method_caller.h"
91 #include "chromeos/cryptohome/homedir_methods.h" 92 #include "chromeos/cryptohome/homedir_methods.h"
92 #include "chromeos/cryptohome/system_salt_getter.h" 93 #include "chromeos/cryptohome/system_salt_getter.h"
93 #include "chromeos/dbus/dbus_thread_manager.h" 94 #include "chromeos/dbus/dbus_thread_manager.h"
94 #include "chromeos/dbus/power_policy_controller.h" 95 #include "chromeos/dbus/power_policy_controller.h"
95 #include "chromeos/dbus/services/console_service_provider.h" 96 #include "chromeos/dbus/services/console_service_provider.h"
96 #include "chromeos/dbus/services/cros_dbus_service.h" 97 #include "chromeos/dbus/services/cros_dbus_service.h"
97 #include "chromeos/dbus/services/display_power_service_provider.h" 98 #include "chromeos/dbus/services/display_power_service_provider.h"
98 #include "chromeos/dbus/services/liveness_service_provider.h" 99 #include "chromeos/dbus/services/liveness_service_provider.h"
99 #include "chromeos/dbus/services/proxy_resolution_service_provider.h" 100 #include "chromeos/dbus/services/proxy_resolution_service_provider.h"
101 #include "chromeos/dbus/services/surface_service_provider.h"
100 #include "chromeos/dbus/session_manager_client.h" 102 #include "chromeos/dbus/session_manager_client.h"
101 #include "chromeos/disks/disk_mount_manager.h" 103 #include "chromeos/disks/disk_mount_manager.h"
102 #include "chromeos/login/login_state.h" 104 #include "chromeos/login/login_state.h"
103 #include "chromeos/login/user_names.h" 105 #include "chromeos/login/user_names.h"
104 #include "chromeos/login_event_recorder.h" 106 #include "chromeos/login_event_recorder.h"
105 #include "chromeos/network/network_change_notifier_chromeos.h" 107 #include "chromeos/network/network_change_notifier_chromeos.h"
106 #include "chromeos/network/network_change_notifier_factory_chromeos.h" 108 #include "chromeos/network/network_change_notifier_factory_chromeos.h"
107 #include "chromeos/network/network_handler.h" 109 #include "chromeos/network/network_handler.h"
108 #include "chromeos/network/portal_detector/network_portal_detector_stub.h" 110 #include "chromeos/network/portal_detector/network_portal_detector_stub.h"
109 #include "chromeos/system/statistics_provider.h" 111 #include "chromeos/system/statistics_provider.h"
(...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after
190 192
191 ScopedVector<CrosDBusService::ServiceProviderInterface> service_providers; 193 ScopedVector<CrosDBusService::ServiceProviderInterface> service_providers;
192 service_providers.push_back(ProxyResolutionServiceProvider::Create( 194 service_providers.push_back(ProxyResolutionServiceProvider::Create(
193 make_scoped_ptr(new ChromeProxyResolverDelegate()))); 195 make_scoped_ptr(new ChromeProxyResolverDelegate())));
194 service_providers.push_back(new DisplayPowerServiceProvider( 196 service_providers.push_back(new DisplayPowerServiceProvider(
195 make_scoped_ptr(new ChromeDisplayPowerServiceProviderDelegate))); 197 make_scoped_ptr(new ChromeDisplayPowerServiceProviderDelegate)));
196 service_providers.push_back(new LivenessServiceProvider); 198 service_providers.push_back(new LivenessServiceProvider);
197 service_providers.push_back(new ScreenLockServiceProvider); 199 service_providers.push_back(new ScreenLockServiceProvider);
198 service_providers.push_back(new ConsoleServiceProvider( 200 service_providers.push_back(new ConsoleServiceProvider(
199 make_scoped_ptr(new ChromeConsoleServiceProviderDelegate))); 201 make_scoped_ptr(new ChromeConsoleServiceProviderDelegate)));
202 service_providers.push_back(new SurfaceServiceProvider(
203 make_scoped_ptr(new ChromeSurfaceServiceProviderDelegate)));
200 CrosDBusService::Initialize(service_providers.Pass()); 204 CrosDBusService::Initialize(service_providers.Pass());
201 205
202 // Initialize PowerDataCollector after DBusThreadManager is initialized. 206 // Initialize PowerDataCollector after DBusThreadManager is initialized.
203 PowerDataCollector::Initialize(); 207 PowerDataCollector::Initialize();
204 208
205 LoginState::Initialize(); 209 LoginState::Initialize();
206 SystemSaltGetter::Initialize(); 210 SystemSaltGetter::Initialize();
207 TPMTokenLoader::Initialize(); 211 TPMTokenLoader::Initialize();
208 CertLoader::Initialize(); 212 CertLoader::Initialize();
209 213
(...skipping 578 matching lines...) Expand 10 before | Expand all | Expand 10 after
788 // Destroy DBus services immediately after threads are stopped. 792 // Destroy DBus services immediately after threads are stopped.
789 dbus_services_.reset(); 793 dbus_services_.reset();
790 794
791 ChromeBrowserMainPartsLinux::PostDestroyThreads(); 795 ChromeBrowserMainPartsLinux::PostDestroyThreads();
792 796
793 // Destroy DeviceSettingsService after g_browser_process. 797 // Destroy DeviceSettingsService after g_browser_process.
794 DeviceSettingsService::Shutdown(); 798 DeviceSettingsService::Shutdown();
795 } 799 }
796 800
797 } // namespace chromeos 801 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698