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

Unified Diff: ash/shell.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: ash/shell.cc
diff --git a/ash/shell.cc b/ash/shell.cc
index 72eb8eb32f0da8cce391e8ebf7fa6e97ddfcb9ca..219af2ea9883b676fe219b2130619d7354d30608 100644
--- a/ash/shell.cc
+++ b/ash/shell.cc
@@ -49,6 +49,7 @@
#include "ash/shell_factory.h"
#include "ash/shell_init_params.h"
#include "ash/shell_window_ids.h"
+#include "ash/surfaces/surface_controller.h"
#include "ash/system/locale/locale_notification_controller.h"
#include "ash/system/status_area_widget.h"
#include "ash/system/tray/system_tray_delegate.h"
@@ -653,6 +654,7 @@ Shell::Shell(ShellDelegate* delegate, base::SequencedWorkerPool* blocking_pool)
display_manager_.reset(new DisplayManager);
window_tree_host_manager_.reset(new WindowTreeHostManager);
user_metrics_recorder_.reset(new UserMetricsRecorder);
+ surface_controller_.reset(new SurfaceController);
#if defined(OS_CHROMEOS)
PowerStatus::Initialize();
@@ -792,6 +794,8 @@ Shell::~Shell() {
power_button_controller_.reset();
lock_state_controller_.reset();
+ surface_controller_.reset();
+
#if defined(OS_CHROMEOS)
resolution_notification_controller_.reset();
#endif

Powered by Google App Engine
This is Rietveld 408576698