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

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: tweak 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
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 LastWindowClosedLogoutReminder; 106 class LastWindowClosedLogoutReminder;
108 class LinkHandlerModelFactory; 107 class LinkHandlerModelFactory;
109 class LocaleNotificationController; 108 class LocaleNotificationController;
110 class LockStateController; 109 class LockStateController;
111 enum class LoginStatus; 110 enum class LoginStatus;
112 class LogoutConfirmationController; 111 class LogoutConfirmationController;
113 class MagnificationController; 112 class MagnificationController;
114 class MaximizeModeController; 113 class MaximizeModeController;
115 class MaximizeModeWindowManager; 114 class MaximizeModeWindowManager;
(...skipping 404 matching lines...) Expand 10 before | Expand all | Expand 10 after
520 ShelfDelegate* GetShelfDelegate(); 519 ShelfDelegate* GetShelfDelegate();
521 520
522 UserMetricsRecorder* metrics() { return user_metrics_recorder_.get(); } 521 UserMetricsRecorder* metrics() { return user_metrics_recorder_.get(); }
523 522
524 void SetTouchHudProjectionEnabled(bool enabled); 523 void SetTouchHudProjectionEnabled(bool enabled);
525 524
526 bool is_touch_hud_projection_enabled() const { 525 bool is_touch_hud_projection_enabled() const {
527 return is_touch_hud_projection_enabled_; 526 return is_touch_hud_projection_enabled_;
528 } 527 }
529 528
530 KeyboardUI* keyboard_ui() { return keyboard_ui_.get(); }
531
532 // TODO(sky): remove this. This was needed by sysui, but as sysui is going 529 // TODO(sky): remove this. This was needed by sysui, but as sysui is going
533 // away it should no longer be needed. 530 // away it should no longer be needed.
534 bool in_mus() const { return in_mus_; } 531 bool in_mus() const { return in_mus_; }
535 532
536 #if defined(OS_CHROMEOS) 533 #if defined(OS_CHROMEOS)
537 // Creates instance of FirstRunHelper. Caller is responsible for deleting 534 // Creates instance of FirstRunHelper. Caller is responsible for deleting
538 // returned object. 535 // returned object.
539 ash::FirstRunHelper* CreateFirstRunHelper(); 536 ash::FirstRunHelper* CreateFirstRunHelper();
540 537
541 // Toggles cursor compositing on/off. Native cursor is disabled when cursor 538 // Toggles cursor compositing on/off. Native cursor is disabled when cursor
(...skipping 196 matching lines...) Expand 10 before | Expand all | Expand 10 after
738 735
739 bool is_touch_hud_projection_enabled_; 736 bool is_touch_hud_projection_enabled_;
740 737
741 // Injected content::GPUDataManager support. 738 // Injected content::GPUDataManager support.
742 std::unique_ptr<GPUSupport> gpu_support_; 739 std::unique_ptr<GPUSupport> gpu_support_;
743 740
744 base::SequencedWorkerPool* blocking_pool_; 741 base::SequencedWorkerPool* blocking_pool_;
745 742
746 bool in_mus_ = false; 743 bool in_mus_ = false;
747 744
748 std::unique_ptr<KeyboardUI> keyboard_ui_;
749
750 DISALLOW_COPY_AND_ASSIGN(Shell); 745 DISALLOW_COPY_AND_ASSIGN(Shell);
751 }; 746 };
752 747
753 } // namespace ash 748 } // namespace ash
754 749
755 #endif // ASH_SHELL_H_ 750 #endif // ASH_SHELL_H_
OLDNEW
« ash/common/wm_shell.cc ('K') | « ash/common/wm_shell.cc ('k') | ash/shell.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698