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

Unified 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 side-by-side diff with in-line comments
Download patch
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 d9ccf5c9a90061475a03a66a5d4cbb520f46920a..e17d13954361511acca4fd4cc61167a55f91e574 100644
--- a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
+++ b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
@@ -34,6 +34,7 @@
#include "chrome/browser/chromeos/dbus/chrome_console_service_provider_delegate.h"
#include "chrome/browser/chromeos/dbus/chrome_display_power_service_provider_delegate.h"
#include "chrome/browser/chromeos/dbus/chrome_proxy_resolver_delegate.h"
+#include "chrome/browser/chromeos/dbus/chrome_surface_service_provider_delegate.h"
#include "chrome/browser/chromeos/dbus/screen_lock_service_provider.h"
#include "chrome/browser/chromeos/events/event_rewriter.h"
#include "chrome/browser/chromeos/events/event_rewriter_controller.h"
@@ -97,6 +98,7 @@
#include "chromeos/dbus/services/display_power_service_provider.h"
#include "chromeos/dbus/services/liveness_service_provider.h"
#include "chromeos/dbus/services/proxy_resolution_service_provider.h"
+#include "chromeos/dbus/services/surface_service_provider.h"
#include "chromeos/dbus/session_manager_client.h"
#include "chromeos/disks/disk_mount_manager.h"
#include "chromeos/login/login_state.h"
@@ -197,6 +199,8 @@ class DBusServices {
service_providers.push_back(new ScreenLockServiceProvider);
service_providers.push_back(new ConsoleServiceProvider(
make_scoped_ptr(new ChromeConsoleServiceProviderDelegate)));
+ service_providers.push_back(new SurfaceServiceProvider(
+ make_scoped_ptr(new ChromeSurfaceServiceProviderDelegate)));
CrosDBusService::Initialize(service_providers.Pass());
// Initialize PowerDataCollector after DBusThreadManager is initialized.

Powered by Google App Engine
This is Rietveld 408576698