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

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: 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 | « no previous file | ash/shell.cc » ('j') | chromeos/accelerometer/accelerometer_reader.cc » ('J')
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 UserActivityPowerManagerNotifier; 54 class UserActivityPowerManagerNotifier;
(...skipping 450 matching lines...) Expand 10 before | Expand all | Expand 10 after
511 } 505 }
512 506
513 // Starts the animation that occurs on first login. 507 // Starts the animation that occurs on first login.
514 void DoInitialWorkspaceAnimation(); 508 void DoInitialWorkspaceAnimation();
515 509
516 MaximizeModeController* maximize_mode_controller() { 510 MaximizeModeController* maximize_mode_controller() {
517 return maximize_mode_controller_.get(); 511 return maximize_mode_controller_.get();
518 } 512 }
519 513
520 #if defined(OS_CHROMEOS) 514 #if defined(OS_CHROMEOS)
521 chromeos::AccelerometerReader* accelerometer_reader() {
522 return accelerometer_reader_.get();
523 }
524
525 // TODO(oshima): Move these objects to DisplayController. 515 // TODO(oshima): Move these objects to DisplayController.
526 ui::DisplayConfigurator* display_configurator() { 516 ui::DisplayConfigurator* display_configurator() {
527 return display_configurator_.get(); 517 return display_configurator_.get();
528 } 518 }
529 DisplayConfiguratorAnimation* display_configurator_animation() { 519 DisplayConfiguratorAnimation* display_configurator_animation() {
530 return display_configurator_animation_.get(); 520 return display_configurator_animation_.get();
531 } 521 }
532 DisplayErrorObserver* display_error_observer() { 522 DisplayErrorObserver* display_error_observer() {
533 return display_error_observer_.get(); 523 return display_error_observer_.get();
534 } 524 }
(...skipping 173 matching lines...) Expand 10 before | Expand all | Expand 10 after
708 scoped_ptr< ::wm::AcceleratorFilter> accelerator_filter_; 698 scoped_ptr< ::wm::AcceleratorFilter> accelerator_filter_;
709 699
710 // An event filter that pre-handles all key events to send them to an IME. 700 // An event filter that pre-handles all key events to send them to an IME.
711 scoped_ptr< ::wm::InputMethodEventFilter> input_method_filter_; 701 scoped_ptr< ::wm::InputMethodEventFilter> input_method_filter_;
712 702
713 scoped_ptr<DisplayManager> display_manager_; 703 scoped_ptr<DisplayManager> display_manager_;
714 704
715 scoped_ptr<LocaleNotificationController> locale_notification_controller_; 705 scoped_ptr<LocaleNotificationController> locale_notification_controller_;
716 706
717 #if defined(OS_CHROMEOS) 707 #if defined(OS_CHROMEOS)
718 scoped_ptr<chromeos::AccelerometerReader> accelerometer_reader_;
719 scoped_ptr<PowerEventObserver> power_event_observer_; 708 scoped_ptr<PowerEventObserver> power_event_observer_;
720 scoped_ptr<ui::UserActivityPowerManagerNotifier> user_activity_notifier_; 709 scoped_ptr<ui::UserActivityPowerManagerNotifier> user_activity_notifier_;
721 scoped_ptr<VideoActivityNotifier> video_activity_notifier_; 710 scoped_ptr<VideoActivityNotifier> video_activity_notifier_;
722 scoped_ptr<StickyKeysController> sticky_keys_controller_; 711 scoped_ptr<StickyKeysController> sticky_keys_controller_;
723 scoped_ptr<ResolutionNotificationController> 712 scoped_ptr<ResolutionNotificationController>
724 resolution_notification_controller_; 713 resolution_notification_controller_;
725 scoped_ptr<BluetoothNotificationController> 714 scoped_ptr<BluetoothNotificationController>
726 bluetooth_notification_controller_; 715 bluetooth_notification_controller_;
727 scoped_ptr<LogoutConfirmationController> logout_confirmation_controller_; 716 scoped_ptr<LogoutConfirmationController> logout_confirmation_controller_;
728 scoped_ptr<LastWindowClosedLogoutReminder> 717 scoped_ptr<LastWindowClosedLogoutReminder>
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
769 758
770 // Injected content::GPUDataManager support. 759 // Injected content::GPUDataManager support.
771 scoped_ptr<GPUSupport> gpu_support_; 760 scoped_ptr<GPUSupport> gpu_support_;
772 761
773 DISALLOW_COPY_AND_ASSIGN(Shell); 762 DISALLOW_COPY_AND_ASSIGN(Shell);
774 }; 763 };
775 764
776 } // namespace ash 765 } // namespace ash
777 766
778 #endif // ASH_SHELL_H_ 767 #endif // ASH_SHELL_H_
OLDNEW
« no previous file with comments | « no previous file | ash/shell.cc » ('j') | chromeos/accelerometer/accelerometer_reader.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698