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

Side by Side Diff: ash/shell.h

Issue 2103053004: mash: Convert virtual keyboard system tray item to wm common types (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 years, 5 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/common/wm_shell.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 <memory> 8 #include <memory>
9 #include <utility> 9 #include <utility>
10 #include <vector> 10 #include <vector>
(...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after
95 class WindowTreeHostManager; 95 class WindowTreeHostManager;
96 class DisplayErrorObserver; 96 class DisplayErrorObserver;
97 class DisplayManager; 97 class DisplayManager;
98 class DragDropController; 98 class DragDropController;
99 class EventClientImpl; 99 class EventClientImpl;
100 class EventRewriterEventFilter; 100 class EventRewriterEventFilter;
101 class EventTransformationHandler; 101 class EventTransformationHandler;
102 class FirstRunHelper; 102 class FirstRunHelper;
103 class GPUSupport; 103 class GPUSupport;
104 class HighContrastController; 104 class HighContrastController;
105 class KeyboardUI;
106 class KeyboardUMAEventFilter; 105 class KeyboardUMAEventFilter;
107 class LinkHandlerModelFactory; 106 class LinkHandlerModelFactory;
108 class LocaleNotificationController; 107 class LocaleNotificationController;
109 class LockStateController; 108 class LockStateController;
110 enum class LoginStatus; 109 enum class LoginStatus;
111 class MagnificationController; 110 class MagnificationController;
112 class MaximizeModeController; 111 class MaximizeModeController;
113 class MaximizeModeWindowManager; 112 class MaximizeModeWindowManager;
114 class MediaDelegate; 113 class MediaDelegate;
115 class MouseCursorEventFilter; 114 class MouseCursorEventFilter;
(...skipping 398 matching lines...) Expand 10 before | Expand all | Expand 10 after
514 ShelfDelegate* GetShelfDelegate(); 513 ShelfDelegate* GetShelfDelegate();
515 514
516 UserMetricsRecorder* metrics() { return user_metrics_recorder_.get(); } 515 UserMetricsRecorder* metrics() { return user_metrics_recorder_.get(); }
517 516
518 void SetTouchHudProjectionEnabled(bool enabled); 517 void SetTouchHudProjectionEnabled(bool enabled);
519 518
520 bool is_touch_hud_projection_enabled() const { 519 bool is_touch_hud_projection_enabled() const {
521 return is_touch_hud_projection_enabled_; 520 return is_touch_hud_projection_enabled_;
522 } 521 }
523 522
524 KeyboardUI* keyboard_ui() { return keyboard_ui_.get(); }
525
526 // TODO(sky): remove this. This was needed by sysui, but as sysui is going 523 // TODO(sky): remove this. This was needed by sysui, but as sysui is going
527 // away it should no longer be needed. 524 // away it should no longer be needed.
528 bool in_mus() const { return in_mus_; } 525 bool in_mus() const { return in_mus_; }
529 526
530 #if defined(OS_CHROMEOS) 527 #if defined(OS_CHROMEOS)
531 // Creates instance of FirstRunHelper. Caller is responsible for deleting 528 // Creates instance of FirstRunHelper. Caller is responsible for deleting
532 // returned object. 529 // returned object.
533 ash::FirstRunHelper* CreateFirstRunHelper(); 530 ash::FirstRunHelper* CreateFirstRunHelper();
534 531
535 // Toggles cursor compositing on/off. Native cursor is disabled when cursor 532 // Toggles cursor compositing on/off. Native cursor is disabled when cursor
(...skipping 193 matching lines...) Expand 10 before | Expand all | Expand 10 after
729 726
730 bool is_touch_hud_projection_enabled_; 727 bool is_touch_hud_projection_enabled_;
731 728
732 // Injected content::GPUDataManager support. 729 // Injected content::GPUDataManager support.
733 std::unique_ptr<GPUSupport> gpu_support_; 730 std::unique_ptr<GPUSupport> gpu_support_;
734 731
735 base::SequencedWorkerPool* blocking_pool_; 732 base::SequencedWorkerPool* blocking_pool_;
736 733
737 bool in_mus_ = false; 734 bool in_mus_ = false;
738 735
739 std::unique_ptr<KeyboardUI> keyboard_ui_;
740
741 DISALLOW_COPY_AND_ASSIGN(Shell); 736 DISALLOW_COPY_AND_ASSIGN(Shell);
742 }; 737 };
743 738
744 } // namespace ash 739 } // namespace ash
745 740
746 #endif // ASH_SHELL_H_ 741 #endif // ASH_SHELL_H_
OLDNEW
« no previous file with comments | « ash/common/wm_shell.cc ('k') | ash/shell.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698