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

Unified Diff: ash/shell.cc

Issue 680383007: DeviceOrientation API on ChromeOS (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Reduce Singleton Usage Created 6 years, 1 month 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 f8e6aab42c74b8832e0de6d10f008c2a2dc29d96..a3303de636f36160832dbce03f84cd17e6d2d46b 100644
--- a/ash/shell.cc
+++ b/ash/shell.cc
@@ -121,6 +121,7 @@
#include "ui/gfx/x/x11_types.h"
#endif // defined(USE_X11)
#include "ash/ash_constants.h"
+#include "ash/content/accelerometer/sensor_manager_delegate_chromeos.h"
#include "ash/content/display/screen_orientation_delegate_chromeos.h"
#include "ash/display/display_change_observer_chromeos.h"
#include "ash/display/display_configurator_animation.h"
@@ -817,6 +818,8 @@ Shell::~Shell() {
display_configurator_->RemoveObserver(projecting_observer_.get());
display_change_observer_.reset();
+ sensor_manager_delegate_.reset();
+
PowerStatus::Shutdown();
// Ensure that DBusThreadManager outlives this Shell.
@@ -1062,6 +1065,7 @@ void Shell::Init(const ShellInitParams& init_params) {
bluetooth_notification_controller_.reset(new BluetoothNotificationController);
last_window_closed_logout_reminder_.reset(new LastWindowClosedLogoutReminder);
screen_orientation_delegate_.reset(new ScreenOrientationDelegate());
+ sensor_manager_delegate_.reset(new SensorManagerDelegateChromeOS);
#endif
// The compositor thread and main message loop have to be running in
// order to create mirror window. Run it after the main message loop

Powered by Google App Engine
This is Rietveld 408576698