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

Side by Side Diff: ash/shell.h

Issue 1684823004: Refactors keyboard related code so mash can use a keyboard (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: gn Created 4 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
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 80 matching lines...) Expand 10 before | Expand all | Expand 10 after
91 class DisplayErrorObserver; 91 class DisplayErrorObserver;
92 class DisplayManager; 92 class DisplayManager;
93 class DragDropController; 93 class DragDropController;
94 class EventClientImpl; 94 class EventClientImpl;
95 class EventRewriterEventFilter; 95 class EventRewriterEventFilter;
96 class EventTransformationHandler; 96 class EventTransformationHandler;
97 class FirstRunHelper; 97 class FirstRunHelper;
98 class FocusCycler; 98 class FocusCycler;
99 class GPUSupport; 99 class GPUSupport;
100 class HighContrastController; 100 class HighContrastController;
101 class KeyboardUI;
101 class KeyboardUMAEventFilter; 102 class KeyboardUMAEventFilter;
102 class LastWindowClosedLogoutReminder; 103 class LastWindowClosedLogoutReminder;
103 class LocaleNotificationController; 104 class LocaleNotificationController;
104 class LockStateController; 105 class LockStateController;
105 class LogoutConfirmationController; 106 class LogoutConfirmationController;
106 class MagnificationController; 107 class MagnificationController;
107 class MaximizeModeController; 108 class MaximizeModeController;
108 class MaximizeModeWindowManager; 109 class MaximizeModeWindowManager;
109 class MediaDelegate; 110 class MediaDelegate;
110 class MouseCursorEventFilter; 111 class MouseCursorEventFilter;
(...skipping 446 matching lines...) Expand 10 before | Expand all | Expand 10 after
557 UserMetricsRecorder* metrics() { 558 UserMetricsRecorder* metrics() {
558 return user_metrics_recorder_.get(); 559 return user_metrics_recorder_.get();
559 } 560 }
560 561
561 void SetTouchHudProjectionEnabled(bool enabled); 562 void SetTouchHudProjectionEnabled(bool enabled);
562 563
563 bool is_touch_hud_projection_enabled() const { 564 bool is_touch_hud_projection_enabled() const {
564 return is_touch_hud_projection_enabled_; 565 return is_touch_hud_projection_enabled_;
565 } 566 }
566 567
568 KeyboardUI* keyboard_ui() { return keyboard_ui_.get(); }
569
570 bool in_mus() const { return in_mus_; }
571
567 #if defined(OS_CHROMEOS) 572 #if defined(OS_CHROMEOS)
568 // Creates instance of FirstRunHelper. Caller is responsible for deleting 573 // Creates instance of FirstRunHelper. Caller is responsible for deleting
569 // returned object. 574 // returned object.
570 ash::FirstRunHelper* CreateFirstRunHelper(); 575 ash::FirstRunHelper* CreateFirstRunHelper();
571 576
572 // Toggles cursor compositing on/off. Native cursor is disabled when cursor 577 // Toggles cursor compositing on/off. Native cursor is disabled when cursor
573 // compositing is enabled, and vice versa. 578 // compositing is enabled, and vice versa.
574 void SetCursorCompositingEnabled(bool enabled); 579 void SetCursorCompositingEnabled(bool enabled);
575 580
576 StickyKeysController* sticky_keys_controller() { 581 StickyKeysController* sticky_keys_controller() {
(...skipping 182 matching lines...) Expand 10 before | Expand all | Expand 10 after
759 // For testing only: simulate that a modal window is open 764 // For testing only: simulate that a modal window is open
760 bool simulate_modal_window_open_for_testing_; 765 bool simulate_modal_window_open_for_testing_;
761 766
762 bool is_touch_hud_projection_enabled_; 767 bool is_touch_hud_projection_enabled_;
763 768
764 // Injected content::GPUDataManager support. 769 // Injected content::GPUDataManager support.
765 scoped_ptr<GPUSupport> gpu_support_; 770 scoped_ptr<GPUSupport> gpu_support_;
766 771
767 base::SequencedWorkerPool* blocking_pool_; 772 base::SequencedWorkerPool* blocking_pool_;
768 773
774 bool in_mus_ = false;
775
776 scoped_ptr<KeyboardUI> keyboard_ui_;
777
769 DISALLOW_COPY_AND_ASSIGN(Shell); 778 DISALLOW_COPY_AND_ASSIGN(Shell);
770 }; 779 };
771 780
772 } // namespace ash 781 } // namespace ash
773 782
774 #endif // ASH_SHELL_H_ 783 #endif // ASH_SHELL_H_
OLDNEW
« ash/mus/sysui_application.cc ('K') | « ash/mus/sysui_application.cc ('k') | ash/shell.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698