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

Unified Diff: ash/shell.h

Issue 236153002: Merge 261317 "Read and expose accelerometer values from cros-ec-..." (Closed) Base URL: svn://svn.chromium.org/chrome/branches/1916/src/
Patch Set: Created 6 years, 8 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
« no previous file with comments | « ash/ash.gyp ('k') | ash/shell.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/shell.h
===================================================================
--- ash/shell.h (revision 263397)
+++ ash/shell.h (working copy)
@@ -74,6 +74,7 @@
namespace ash {
class AcceleratorController;
+class AccelerometerController;
class AccessibilityDelegate;
class AshNativeCursorManager;
class AutoclickController;
@@ -500,6 +501,10 @@
// Starts the animation that occurs on first login.
void DoInitialWorkspaceAnimation();
+ AccelerometerController* accelerometer_controller() {
+ return accelerometer_controller_.get();
+ }
+
#if defined(OS_CHROMEOS)
#if defined(USE_X11)
// TODO(oshima): Move these objects to DisplayController.
@@ -699,6 +704,8 @@
// The maximized window manager (if enabled).
scoped_ptr<internal::MaximizeModeWindowManager> maximize_mode_window_manager_;
+ scoped_ptr<AccelerometerController> accelerometer_controller_;
+
#if defined(OS_CHROMEOS)
scoped_ptr<internal::PowerEventObserver> power_event_observer_;
scoped_ptr<internal::UserActivityNotifier> user_activity_notifier_;
« no previous file with comments | « ash/ash.gyp ('k') | ash/shell.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698