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

Side by Side Diff: ash/common/wm_shell.h

Issue 2271373002: mash: Port mojo:ash_sysui's ContextMenuMus to mojo:ash. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Address comments Created 4 years, 3 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/wallpaper/wallpaper_delegate.h ('k') | ash/common/wm_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 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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_COMMON_WM_SHELL_H_ 5 #ifndef ASH_COMMON_WM_SHELL_H_
6 #define ASH_COMMON_WM_SHELL_H_ 6 #define ASH_COMMON_WM_SHELL_H_
7 7
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include <memory> 10 #include <memory>
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
49 class ScopedDisableInternalMouseAndKeyboard; 49 class ScopedDisableInternalMouseAndKeyboard;
50 class SessionStateDelegate; 50 class SessionStateDelegate;
51 class ShelfDelegate; 51 class ShelfDelegate;
52 class ShelfModel; 52 class ShelfModel;
53 class ShelfWindowWatcher; 53 class ShelfWindowWatcher;
54 class ShellDelegate; 54 class ShellDelegate;
55 class ShellObserver; 55 class ShellObserver;
56 class SystemTrayDelegate; 56 class SystemTrayDelegate;
57 class SystemTrayNotifier; 57 class SystemTrayNotifier;
58 class ToastManager; 58 class ToastManager;
59 class WallpaperDelegate;
59 class WindowCycleController; 60 class WindowCycleController;
60 class WindowCycleEventFilter; 61 class WindowCycleEventFilter;
61 class WindowResizer; 62 class WindowResizer;
62 class WindowSelectorController; 63 class WindowSelectorController;
63 class WmActivationObserver; 64 class WmActivationObserver;
64 class WmDisplayObserver; 65 class WmDisplayObserver;
65 class WmWindow; 66 class WmWindow;
66 67
67 enum class TaskSwitchSource; 68 enum class TaskSwitchSource;
68 69
(...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after
135 SystemTrayNotifier* system_tray_notifier() { 136 SystemTrayNotifier* system_tray_notifier() {
136 return system_tray_notifier_.get(); 137 return system_tray_notifier_.get();
137 } 138 }
138 139
139 SystemTrayDelegate* system_tray_delegate() { 140 SystemTrayDelegate* system_tray_delegate() {
140 return system_tray_delegate_.get(); 141 return system_tray_delegate_.get();
141 } 142 }
142 143
143 ToastManager* toast_manager() { return toast_manager_.get(); } 144 ToastManager* toast_manager() { return toast_manager_.get(); }
144 145
146 WallpaperDelegate* wallpaper_delegate() { return wallpaper_delegate_.get(); }
147
145 WindowCycleController* window_cycle_controller() { 148 WindowCycleController* window_cycle_controller() {
146 return window_cycle_controller_.get(); 149 return window_cycle_controller_.get();
147 } 150 }
148 151
149 WindowSelectorController* window_selector_controller() { 152 WindowSelectorController* window_selector_controller() {
150 return window_selector_controller_.get(); 153 return window_selector_controller_.get();
151 } 154 }
152 155
153 // Creates a new window used as a container of other windows. No painting is 156 // Creates a new window used as a container of other windows. No painting is
154 // done to the created window. 157 // done to the created window.
(...skipping 246 matching lines...) Expand 10 before | Expand all | Expand 10 after
401 std::unique_ptr<MediaDelegate> media_delegate_; 404 std::unique_ptr<MediaDelegate> media_delegate_;
402 std::unique_ptr<MruWindowTracker> mru_window_tracker_; 405 std::unique_ptr<MruWindowTracker> mru_window_tracker_;
403 std::unique_ptr<NewWindowDelegate> new_window_delegate_; 406 std::unique_ptr<NewWindowDelegate> new_window_delegate_;
404 std::unique_ptr<PaletteDelegate> palette_delegate_; 407 std::unique_ptr<PaletteDelegate> palette_delegate_;
405 std::unique_ptr<ShelfDelegate> shelf_delegate_; 408 std::unique_ptr<ShelfDelegate> shelf_delegate_;
406 std::unique_ptr<ShelfModel> shelf_model_; 409 std::unique_ptr<ShelfModel> shelf_model_;
407 std::unique_ptr<ShelfWindowWatcher> shelf_window_watcher_; 410 std::unique_ptr<ShelfWindowWatcher> shelf_window_watcher_;
408 std::unique_ptr<SystemTrayNotifier> system_tray_notifier_; 411 std::unique_ptr<SystemTrayNotifier> system_tray_notifier_;
409 std::unique_ptr<SystemTrayDelegate> system_tray_delegate_; 412 std::unique_ptr<SystemTrayDelegate> system_tray_delegate_;
410 std::unique_ptr<ToastManager> toast_manager_; 413 std::unique_ptr<ToastManager> toast_manager_;
414 std::unique_ptr<WallpaperDelegate> wallpaper_delegate_;
411 std::unique_ptr<WindowCycleController> window_cycle_controller_; 415 std::unique_ptr<WindowCycleController> window_cycle_controller_;
412 std::unique_ptr<WindowSelectorController> window_selector_controller_; 416 std::unique_ptr<WindowSelectorController> window_selector_controller_;
413 417
414 base::ObserverList<LockStateObserver> lock_state_observers_; 418 base::ObserverList<LockStateObserver> lock_state_observers_;
415 419
416 // See comment for GetRootWindowForNewWindows(). 420 // See comment for GetRootWindowForNewWindows().
417 WmWindow* root_window_for_new_windows_ = nullptr; 421 WmWindow* root_window_for_new_windows_ = nullptr;
418 WmWindow* scoped_root_window_for_new_windows_ = nullptr; 422 WmWindow* scoped_root_window_for_new_windows_ = nullptr;
419 423
420 bool simulate_modal_window_open_for_testing_ = false; 424 bool simulate_modal_window_open_for_testing_ = false;
421 425
422 #if defined(OS_CHROMEOS) 426 #if defined(OS_CHROMEOS)
423 std::unique_ptr<LogoutConfirmationController> logout_confirmation_controller_; 427 std::unique_ptr<LogoutConfirmationController> logout_confirmation_controller_;
424 #endif 428 #endif
425 }; 429 };
426 430
427 } // namespace ash 431 } // namespace ash
428 432
429 #endif // ASH_COMMON_WM_SHELL_H_ 433 #endif // ASH_COMMON_WM_SHELL_H_
OLDNEW
« no previous file with comments | « ash/common/wallpaper/wallpaper_delegate.h ('k') | ash/common/wm_shell.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698