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

Side by Side Diff: ash/shell.h

Issue 118543002: Move sticky keys files to their own directory and rename to StickyKeysController. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: update ash.gyp Created 7 years 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
« no previous file with comments | « ash/ash.gyp ('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 83 matching lines...) Expand 10 before | Expand all | Expand 10 after
94 class NewWindowDelegate; 94 class NewWindowDelegate;
95 class PartialMagnificationController; 95 class PartialMagnificationController;
96 class PowerButtonController; 96 class PowerButtonController;
97 class RootWindowHostFactory; 97 class RootWindowHostFactory;
98 class ScreenAsh; 98 class ScreenAsh;
99 class SessionStateDelegate; 99 class SessionStateDelegate;
100 class ShelfItemDelegateManager; 100 class ShelfItemDelegateManager;
101 class ShelfModel; 101 class ShelfModel;
102 class ShellDelegate; 102 class ShellDelegate;
103 class ShellObserver; 103 class ShellObserver;
104 class StickyKeys; 104 class StickyKeysController;
105 class SystemTray; 105 class SystemTray;
106 class SystemTrayDelegate; 106 class SystemTrayDelegate;
107 class SystemTrayNotifier; 107 class SystemTrayNotifier;
108 class UserActivityDetector; 108 class UserActivityDetector;
109 class UserWallpaperDelegate; 109 class UserWallpaperDelegate;
110 class VideoDetector; 110 class VideoDetector;
111 class WebNotificationTray; 111 class WebNotificationTray;
112 class WindowCycleController; 112 class WindowCycleController;
113 class WindowPositioner; 113 class WindowPositioner;
114 class WindowSelectorController; 114 class WindowSelectorController;
(...skipping 407 matching lines...) Expand 10 before | Expand all | Expand 10 after
522 522
523 bool is_touch_hud_projection_enabled() const { 523 bool is_touch_hud_projection_enabled() const {
524 return is_touch_hud_projection_enabled_; 524 return is_touch_hud_projection_enabled_;
525 } 525 }
526 526
527 #if defined(OS_CHROMEOS) 527 #if defined(OS_CHROMEOS)
528 // Creates instance of FirstRunHelper. Caller is responsible for deleting 528 // Creates instance of FirstRunHelper. Caller is responsible for deleting
529 // returned object. 529 // returned object.
530 ash::FirstRunHelper* CreateFirstRunHelper(); 530 ash::FirstRunHelper* CreateFirstRunHelper();
531 531
532 StickyKeys* sticky_keys() { 532 StickyKeysController* sticky_keys_controller() {
533 return sticky_keys_.get(); 533 return sticky_keys_controller_.get();
534 } 534 }
535 #endif // defined(OS_CHROMEOS) 535 #endif // defined(OS_CHROMEOS)
536 536
537 private: 537 private:
538 FRIEND_TEST_ALL_PREFIXES(ExtendedDesktopTest, TestCursor); 538 FRIEND_TEST_ALL_PREFIXES(ExtendedDesktopTest, TestCursor);
539 FRIEND_TEST_ALL_PREFIXES(WindowManagerTest, MouseEventCursors); 539 FRIEND_TEST_ALL_PREFIXES(WindowManagerTest, MouseEventCursors);
540 FRIEND_TEST_ALL_PREFIXES(WindowManagerTest, TransformActivate); 540 FRIEND_TEST_ALL_PREFIXES(WindowManagerTest, TransformActivate);
541 friend class internal::RootWindowController; 541 friend class internal::RootWindowController;
542 friend class internal::ScopedTargetRootWindow; 542 friend class internal::ScopedTargetRootWindow;
543 friend class test::ShellTestApi; 543 friend class test::ShellTestApi;
(...skipping 124 matching lines...) Expand 10 before | Expand all | Expand 10 after
668 scoped_ptr<base::WeakPtrFactory<internal::DisplayManager> > 668 scoped_ptr<base::WeakPtrFactory<internal::DisplayManager> >
669 weak_display_manager_factory_; 669 weak_display_manager_factory_;
670 670
671 scoped_ptr<internal::LocaleNotificationController> 671 scoped_ptr<internal::LocaleNotificationController>
672 locale_notification_controller_; 672 locale_notification_controller_;
673 673
674 #if defined(OS_CHROMEOS) 674 #if defined(OS_CHROMEOS)
675 scoped_ptr<internal::PowerEventObserver> power_event_observer_; 675 scoped_ptr<internal::PowerEventObserver> power_event_observer_;
676 scoped_ptr<internal::UserActivityNotifier> user_activity_notifier_; 676 scoped_ptr<internal::UserActivityNotifier> user_activity_notifier_;
677 scoped_ptr<internal::VideoActivityNotifier> video_activity_notifier_; 677 scoped_ptr<internal::VideoActivityNotifier> video_activity_notifier_;
678 scoped_ptr<StickyKeys> sticky_keys_; 678 scoped_ptr<StickyKeysController> sticky_keys_controller_;
679 #if defined(USE_X11) 679 #if defined(USE_X11)
680 // Controls video output device state. 680 // Controls video output device state.
681 scoped_ptr<chromeos::OutputConfigurator> output_configurator_; 681 scoped_ptr<chromeos::OutputConfigurator> output_configurator_;
682 scoped_ptr<internal::OutputConfiguratorAnimation> 682 scoped_ptr<internal::OutputConfiguratorAnimation>
683 output_configurator_animation_; 683 output_configurator_animation_;
684 scoped_ptr<internal::DisplayErrorObserver> display_error_observer_; 684 scoped_ptr<internal::DisplayErrorObserver> display_error_observer_;
685 685
686 // Listens for output changes and updates the display manager. 686 // Listens for output changes and updates the display manager.
687 scoped_ptr<internal::DisplayChangeObserver> display_change_observer_; 687 scoped_ptr<internal::DisplayChangeObserver> display_change_observer_;
688 #endif // defined(USE_X11) 688 #endif // defined(USE_X11)
(...skipping 13 matching lines...) Expand all
702 bool simulate_modal_window_open_for_testing_; 702 bool simulate_modal_window_open_for_testing_;
703 703
704 bool is_touch_hud_projection_enabled_; 704 bool is_touch_hud_projection_enabled_;
705 705
706 DISALLOW_COPY_AND_ASSIGN(Shell); 706 DISALLOW_COPY_AND_ASSIGN(Shell);
707 }; 707 };
708 708
709 } // namespace ash 709 } // namespace ash
710 710
711 #endif // ASH_SHELL_H_ 711 #endif // ASH_SHELL_H_
OLDNEW
« 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