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

Side by Side Diff: ash/shell.h

Issue 155493002: Add key based scrolling on magnified screen for kiosk mode. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 10 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 69 matching lines...) Expand 10 before | Expand all | Expand 10 after
80 class AshNativeCursorManager; 80 class AshNativeCursorManager;
81 class AutoclickController; 81 class AutoclickController;
82 class CapsLockDelegate; 82 class CapsLockDelegate;
83 class DesktopBackgroundController; 83 class DesktopBackgroundController;
84 class DisplayController; 84 class DisplayController;
85 class FirstRunHelper; 85 class FirstRunHelper;
86 class GPUSupport; 86 class GPUSupport;
87 class HighContrastController; 87 class HighContrastController;
88 class LockStateController; 88 class LockStateController;
89 class MagnificationController; 89 class MagnificationController;
90 class MagnifierKeyScroller;
90 class MediaDelegate; 91 class MediaDelegate;
91 class MruWindowTracker; 92 class MruWindowTracker;
92 class NestedDispatcherController; 93 class NestedDispatcherController;
93 class NewWindowDelegate; 94 class NewWindowDelegate;
94 class PartialMagnificationController; 95 class PartialMagnificationController;
95 class PowerButtonController; 96 class PowerButtonController;
96 class WindowTreeHostFactory; 97 class WindowTreeHostFactory;
97 class ScreenAsh; 98 class ScreenAsh;
98 class SessionStateDelegate; 99 class SessionStateDelegate;
99 class Shelf; 100 class Shelf;
(...skipping 591 matching lines...) Expand 10 before | Expand all | Expand 10 after
691 resolution_notification_controller_; 692 resolution_notification_controller_;
692 #if defined(USE_X11) 693 #if defined(USE_X11)
693 // Controls video output device state. 694 // Controls video output device state.
694 scoped_ptr<chromeos::OutputConfigurator> output_configurator_; 695 scoped_ptr<chromeos::OutputConfigurator> output_configurator_;
695 scoped_ptr<internal::OutputConfiguratorAnimation> 696 scoped_ptr<internal::OutputConfiguratorAnimation>
696 output_configurator_animation_; 697 output_configurator_animation_;
697 scoped_ptr<internal::DisplayErrorObserver> display_error_observer_; 698 scoped_ptr<internal::DisplayErrorObserver> display_error_observer_;
698 699
699 // Listens for output changes and updates the display manager. 700 // Listens for output changes and updates the display manager.
700 scoped_ptr<internal::DisplayChangeObserver> display_change_observer_; 701 scoped_ptr<internal::DisplayChangeObserver> display_change_observer_;
702
703 scoped_ptr<MagnifierKeyScroller> magnifier_key_scroller_;
701 #endif // defined(USE_X11) 704 #endif // defined(USE_X11)
702 #endif // defined(OS_CHROMEOS) 705 #endif // defined(OS_CHROMEOS)
703 706
704 // |native_cursor_manager_| is owned by |cursor_manager_|, but we keep a 707 // |native_cursor_manager_| is owned by |cursor_manager_|, but we keep a
705 // pointer to vend to test code. 708 // pointer to vend to test code.
706 AshNativeCursorManager* native_cursor_manager_; 709 AshNativeCursorManager* native_cursor_manager_;
707 views::corewm::CursorManager cursor_manager_; 710 views::corewm::CursorManager cursor_manager_;
708 711
709 ObserverList<ShellObserver> observers_; 712 ObserverList<ShellObserver> observers_;
710 713
711 // For testing only: simulate that a modal window is open 714 // For testing only: simulate that a modal window is open
712 bool simulate_modal_window_open_for_testing_; 715 bool simulate_modal_window_open_for_testing_;
713 716
714 bool is_touch_hud_projection_enabled_; 717 bool is_touch_hud_projection_enabled_;
715 718
716 // Injected content::GPUDataManager support. 719 // Injected content::GPUDataManager support.
717 scoped_ptr<GPUSupport> gpu_support_; 720 scoped_ptr<GPUSupport> gpu_support_;
718 721
719 DISALLOW_COPY_AND_ASSIGN(Shell); 722 DISALLOW_COPY_AND_ASSIGN(Shell);
720 }; 723 };
721 724
722 } // namespace ash 725 } // namespace ash
723 726
724 #endif // ASH_SHELL_H_ 727 #endif // ASH_SHELL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698