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

Side by Side Diff: ash/shell.h

Issue 822503003: Change AccelerometerReader to a Singleton (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Update new dependency Created 5 years, 11 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
« no previous file with comments | « ash/content/display/screen_orientation_controller_chromeos.cc ('k') | ash/shell.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 24 matching lines...) Expand all
35 namespace aura { 35 namespace aura {
36 class EventFilter; 36 class EventFilter;
37 class RootWindow; 37 class RootWindow;
38 class Window; 38 class Window;
39 namespace client { 39 namespace client {
40 class ActivationClient; 40 class ActivationClient;
41 class FocusClient; 41 class FocusClient;
42 } 42 }
43 } 43 }
44 44
45 #if defined(OS_CHROMEOS)
46 namespace chromeos {
47 class AccelerometerReader;
48 }
49 #endif
50
51 namespace gfx { 45 namespace gfx {
52 class ImageSkia; 46 class ImageSkia;
53 class Point; 47 class Point;
54 class Rect; 48 class Rect;
55 } 49 }
56 50
57 namespace ui { 51 namespace ui {
58 class DisplayConfigurator; 52 class DisplayConfigurator;
59 class Layer; 53 class Layer;
60 class UserActivityDetector; 54 class UserActivityDetector;
(...skipping 449 matching lines...) Expand 10 before | Expand all | Expand 10 after
510 } 504 }
511 505
512 // Starts the animation that occurs on first login. 506 // Starts the animation that occurs on first login.
513 void DoInitialWorkspaceAnimation(); 507 void DoInitialWorkspaceAnimation();
514 508
515 MaximizeModeController* maximize_mode_controller() { 509 MaximizeModeController* maximize_mode_controller() {
516 return maximize_mode_controller_.get(); 510 return maximize_mode_controller_.get();
517 } 511 }
518 512
519 #if defined(OS_CHROMEOS) 513 #if defined(OS_CHROMEOS)
520 chromeos::AccelerometerReader* accelerometer_reader() {
521 return accelerometer_reader_.get();
522 }
523
524 // TODO(oshima): Move these objects to DisplayController. 514 // TODO(oshima): Move these objects to DisplayController.
525 ui::DisplayConfigurator* display_configurator() { 515 ui::DisplayConfigurator* display_configurator() {
526 return display_configurator_.get(); 516 return display_configurator_.get();
527 } 517 }
528 DisplayConfiguratorAnimation* display_configurator_animation() { 518 DisplayConfiguratorAnimation* display_configurator_animation() {
529 return display_configurator_animation_.get(); 519 return display_configurator_animation_.get();
530 } 520 }
531 DisplayErrorObserver* display_error_observer() { 521 DisplayErrorObserver* display_error_observer() {
532 return display_error_observer_.get(); 522 return display_error_observer_.get();
533 } 523 }
(...skipping 173 matching lines...) Expand 10 before | Expand all | Expand 10 after
707 scoped_ptr< ::wm::AcceleratorFilter> accelerator_filter_; 697 scoped_ptr< ::wm::AcceleratorFilter> accelerator_filter_;
708 698
709 // An event filter that pre-handles all key events to send them to an IME. 699 // An event filter that pre-handles all key events to send them to an IME.
710 scoped_ptr< ::wm::InputMethodEventFilter> input_method_filter_; 700 scoped_ptr< ::wm::InputMethodEventFilter> input_method_filter_;
711 701
712 scoped_ptr<DisplayManager> display_manager_; 702 scoped_ptr<DisplayManager> display_manager_;
713 703
714 scoped_ptr<LocaleNotificationController> locale_notification_controller_; 704 scoped_ptr<LocaleNotificationController> locale_notification_controller_;
715 705
716 #if defined(OS_CHROMEOS) 706 #if defined(OS_CHROMEOS)
717 scoped_ptr<chromeos::AccelerometerReader> accelerometer_reader_;
718 scoped_ptr<PowerEventObserver> power_event_observer_; 707 scoped_ptr<PowerEventObserver> power_event_observer_;
719 scoped_ptr<ui::UserActivityPowerManagerNotifier> user_activity_notifier_; 708 scoped_ptr<ui::UserActivityPowerManagerNotifier> user_activity_notifier_;
720 scoped_ptr<VideoActivityNotifier> video_activity_notifier_; 709 scoped_ptr<VideoActivityNotifier> video_activity_notifier_;
721 scoped_ptr<StickyKeysController> sticky_keys_controller_; 710 scoped_ptr<StickyKeysController> sticky_keys_controller_;
722 scoped_ptr<ResolutionNotificationController> 711 scoped_ptr<ResolutionNotificationController>
723 resolution_notification_controller_; 712 resolution_notification_controller_;
724 scoped_ptr<BluetoothNotificationController> 713 scoped_ptr<BluetoothNotificationController>
725 bluetooth_notification_controller_; 714 bluetooth_notification_controller_;
726 scoped_ptr<LogoutConfirmationController> logout_confirmation_controller_; 715 scoped_ptr<LogoutConfirmationController> logout_confirmation_controller_;
727 scoped_ptr<LastWindowClosedLogoutReminder> 716 scoped_ptr<LastWindowClosedLogoutReminder>
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
768 757
769 // Injected content::GPUDataManager support. 758 // Injected content::GPUDataManager support.
770 scoped_ptr<GPUSupport> gpu_support_; 759 scoped_ptr<GPUSupport> gpu_support_;
771 760
772 DISALLOW_COPY_AND_ASSIGN(Shell); 761 DISALLOW_COPY_AND_ASSIGN(Shell);
773 }; 762 };
774 763
775 } // namespace ash 764 } // namespace ash
776 765
777 #endif // ASH_SHELL_H_ 766 #endif // ASH_SHELL_H_
OLDNEW
« no previous file with comments | « ash/content/display/screen_orientation_controller_chromeos.cc ('k') | ash/shell.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698