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

Side by Side Diff: ash/shell.h

Issue 200643005: Read and expose accelerometer values from cros-ec-accel trigger. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Don't bind to AccelerometerReader, post to standalone function with scoped_refptr to data structure. 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 #ifndef ASH_SHELL_H_ 5 #ifndef ASH_SHELL_H_
6 #define ASH_SHELL_H_ 6 #define ASH_SHELL_H_
7 7
8 #include <utility> 8 #include <utility>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
67 class CompoundEventFilter; 67 class CompoundEventFilter;
68 class InputMethodEventFilter; 68 class InputMethodEventFilter;
69 class ShadowController; 69 class ShadowController;
70 class VisibilityController; 70 class VisibilityController;
71 class WindowModalityController; 71 class WindowModalityController;
72 } 72 }
73 73
74 namespace ash { 74 namespace ash {
75 75
76 class AcceleratorController; 76 class AcceleratorController;
77 class AccelerometerController;
77 class AccessibilityDelegate; 78 class AccessibilityDelegate;
78 class AshNativeCursorManager; 79 class AshNativeCursorManager;
79 class AutoclickController; 80 class AutoclickController;
80 class DesktopBackgroundController; 81 class DesktopBackgroundController;
81 class DisplayController; 82 class DisplayController;
82 class FirstRunHelper; 83 class FirstRunHelper;
83 class GPUSupport; 84 class GPUSupport;
84 class HighContrastController; 85 class HighContrastController;
85 class LockStateController; 86 class LockStateController;
86 class MagnificationController; 87 class MagnificationController;
(...skipping 406 matching lines...) Expand 10 before | Expand all | Expand 10 after
493 } 494 }
494 495
495 // Made available for tests. 496 // Made available for tests.
496 ::wm::ShadowController* shadow_controller() { 497 ::wm::ShadowController* shadow_controller() {
497 return shadow_controller_.get(); 498 return shadow_controller_.get();
498 } 499 }
499 500
500 // Starts the animation that occurs on first login. 501 // Starts the animation that occurs on first login.
501 void DoInitialWorkspaceAnimation(); 502 void DoInitialWorkspaceAnimation();
502 503
504 AccelerometerController* accelerometer_controller() {
505 return accelerometer_controller_.get();
506 }
507
503 #if defined(OS_CHROMEOS) 508 #if defined(OS_CHROMEOS)
504 // TODO(oshima): Move these objects to DisplayController. 509 // TODO(oshima): Move these objects to DisplayController.
505 ui::OutputConfigurator* output_configurator() { 510 ui::OutputConfigurator* output_configurator() {
506 return output_configurator_.get(); 511 return output_configurator_.get();
507 } 512 }
508 internal::OutputConfiguratorAnimation* output_configurator_animation() { 513 internal::OutputConfiguratorAnimation* output_configurator_animation() {
509 return output_configurator_animation_.get(); 514 return output_configurator_animation_.get();
510 } 515 }
511 internal::DisplayErrorObserver* display_error_observer() { 516 internal::DisplayErrorObserver* display_error_observer() {
512 return display_error_observer_.get(); 517 return display_error_observer_.get();
(...skipping 186 matching lines...) Expand 10 before | Expand all | Expand 10 after
699 704
700 #if defined(OS_CHROMEOS) 705 #if defined(OS_CHROMEOS)
701 scoped_ptr<internal::PowerEventObserver> power_event_observer_; 706 scoped_ptr<internal::PowerEventObserver> power_event_observer_;
702 scoped_ptr<internal::UserActivityNotifier> user_activity_notifier_; 707 scoped_ptr<internal::UserActivityNotifier> user_activity_notifier_;
703 scoped_ptr<internal::VideoActivityNotifier> video_activity_notifier_; 708 scoped_ptr<internal::VideoActivityNotifier> video_activity_notifier_;
704 scoped_ptr<StickyKeysController> sticky_keys_controller_; 709 scoped_ptr<StickyKeysController> sticky_keys_controller_;
705 scoped_ptr<internal::ResolutionNotificationController> 710 scoped_ptr<internal::ResolutionNotificationController>
706 resolution_notification_controller_; 711 resolution_notification_controller_;
707 scoped_ptr<internal::BluetoothNotificationController> 712 scoped_ptr<internal::BluetoothNotificationController>
708 bluetooth_notification_controller_; 713 bluetooth_notification_controller_;
714 scoped_ptr<AccelerometerController> accelerometer_controller_;
709 scoped_ptr<internal::LogoutConfirmationController> 715 scoped_ptr<internal::LogoutConfirmationController>
710 logout_confirmation_controller_; 716 logout_confirmation_controller_;
711 scoped_ptr<internal::LastWindowClosedLogoutReminder> 717 scoped_ptr<internal::LastWindowClosedLogoutReminder>
712 last_window_closed_logout_reminder_; 718 last_window_closed_logout_reminder_;
713 // Controls video output device state. 719 // Controls video output device state.
714 scoped_ptr<ui::OutputConfigurator> output_configurator_; 720 scoped_ptr<ui::OutputConfigurator> output_configurator_;
715 scoped_ptr<internal::OutputConfiguratorAnimation> 721 scoped_ptr<internal::OutputConfiguratorAnimation>
716 output_configurator_animation_; 722 output_configurator_animation_;
717 scoped_ptr<internal::DisplayErrorObserver> display_error_observer_; 723 scoped_ptr<internal::DisplayErrorObserver> display_error_observer_;
718 scoped_ptr<internal::ProjectingObserver> projecting_observer_; 724 scoped_ptr<internal::ProjectingObserver> projecting_observer_;
(...skipping 21 matching lines...) Expand all
740 746
741 // Injected content::GPUDataManager support. 747 // Injected content::GPUDataManager support.
742 scoped_ptr<GPUSupport> gpu_support_; 748 scoped_ptr<GPUSupport> gpu_support_;
743 749
744 DISALLOW_COPY_AND_ASSIGN(Shell); 750 DISALLOW_COPY_AND_ASSIGN(Shell);
745 }; 751 };
746 752
747 } // namespace ash 753 } // namespace ash
748 754
749 #endif // ASH_SHELL_H_ 755 #endif // ASH_SHELL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698