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

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

Issue 2199993002: Add generic PaletteDelegate code. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@note-options
Patch Set: Created 4 years, 4 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 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 19 matching lines...) Expand all
30 class AcceleratorController; 30 class AcceleratorController;
31 class AccessibilityDelegate; 31 class AccessibilityDelegate;
32 class BrightnessControlDelegate; 32 class BrightnessControlDelegate;
33 class DisplayInfo; 33 class DisplayInfo;
34 class FocusCycler; 34 class FocusCycler;
35 class KeyboardBrightnessControlDelegate; 35 class KeyboardBrightnessControlDelegate;
36 class KeyboardUI; 36 class KeyboardUI;
37 class MaximizeModeController; 37 class MaximizeModeController;
38 class MruWindowTracker; 38 class MruWindowTracker;
39 class NewWindowDelegate; 39 class NewWindowDelegate;
40 class PaletteDelegate;
40 class ScopedDisableInternalMouseAndKeyboard; 41 class ScopedDisableInternalMouseAndKeyboard;
41 class SessionStateDelegate; 42 class SessionStateDelegate;
42 class ShelfDelegate; 43 class ShelfDelegate;
43 class ShelfModel; 44 class ShelfModel;
44 class ShellDelegate; 45 class ShellDelegate;
45 class ShellObserver; 46 class ShellObserver;
46 class SystemTrayDelegate; 47 class SystemTrayDelegate;
47 class SystemTrayNotifier; 48 class SystemTrayNotifier;
48 class ToastManager; 49 class ToastManager;
49 class WindowCycleController; 50 class WindowCycleController;
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
104 } 105 }
105 106
106 MruWindowTracker* mru_window_tracker() { return mru_window_tracker_.get(); } 107 MruWindowTracker* mru_window_tracker() { return mru_window_tracker_.get(); }
107 108
108 MediaDelegate* media_delegate() { return media_delegate_.get(); } 109 MediaDelegate* media_delegate() { return media_delegate_.get(); }
109 110
110 NewWindowDelegate* new_window_delegate() { 111 NewWindowDelegate* new_window_delegate() {
111 return new_window_delegate_.get(); 112 return new_window_delegate_.get();
112 } 113 }
113 114
115 PaletteDelegate* palette_delegate() { return palette_delegate_.get(); }
116
114 ShelfDelegate* shelf_delegate() { return shelf_delegate_.get(); } 117 ShelfDelegate* shelf_delegate() { return shelf_delegate_.get(); }
115 118
116 ShelfModel* shelf_model() { return shelf_model_.get(); } 119 ShelfModel* shelf_model() { return shelf_model_.get(); }
117 120
118 SystemTrayNotifier* system_tray_notifier() { 121 SystemTrayNotifier* system_tray_notifier() {
119 return system_tray_notifier_.get(); 122 return system_tray_notifier_.get();
120 } 123 }
121 124
122 SystemTrayDelegate* system_tray_delegate() { 125 SystemTrayDelegate* system_tray_delegate() {
123 return system_tray_delegate_.get(); 126 return system_tray_delegate_.get();
(...skipping 206 matching lines...) Expand 10 before | Expand all | Expand 10 after
330 333
331 std::unique_ptr<AcceleratorController> accelerator_controller_; 334 std::unique_ptr<AcceleratorController> accelerator_controller_;
332 std::unique_ptr<AccessibilityDelegate> accessibility_delegate_; 335 std::unique_ptr<AccessibilityDelegate> accessibility_delegate_;
333 std::unique_ptr<BrightnessControlDelegate> brightness_control_delegate_; 336 std::unique_ptr<BrightnessControlDelegate> brightness_control_delegate_;
334 std::unique_ptr<FocusCycler> focus_cycler_; 337 std::unique_ptr<FocusCycler> focus_cycler_;
335 std::unique_ptr<KeyboardBrightnessControlDelegate> 338 std::unique_ptr<KeyboardBrightnessControlDelegate>
336 keyboard_brightness_control_delegate_; 339 keyboard_brightness_control_delegate_;
337 std::unique_ptr<KeyboardUI> keyboard_ui_; 340 std::unique_ptr<KeyboardUI> keyboard_ui_;
338 std::unique_ptr<MaximizeModeController> maximize_mode_controller_; 341 std::unique_ptr<MaximizeModeController> maximize_mode_controller_;
339 std::unique_ptr<MediaDelegate> media_delegate_; 342 std::unique_ptr<MediaDelegate> media_delegate_;
343 std::unique_ptr<PaletteDelegate> palette_delegate_;
340 std::unique_ptr<MruWindowTracker> mru_window_tracker_; 344 std::unique_ptr<MruWindowTracker> mru_window_tracker_;
341 std::unique_ptr<NewWindowDelegate> new_window_delegate_; 345 std::unique_ptr<NewWindowDelegate> new_window_delegate_;
342 std::unique_ptr<ShelfDelegate> shelf_delegate_; 346 std::unique_ptr<ShelfDelegate> shelf_delegate_;
343 std::unique_ptr<ShelfModel> shelf_model_; 347 std::unique_ptr<ShelfModel> shelf_model_;
344 std::unique_ptr<SystemTrayNotifier> system_tray_notifier_; 348 std::unique_ptr<SystemTrayNotifier> system_tray_notifier_;
345 std::unique_ptr<SystemTrayDelegate> system_tray_delegate_; 349 std::unique_ptr<SystemTrayDelegate> system_tray_delegate_;
346 std::unique_ptr<ToastManager> toast_manager_; 350 std::unique_ptr<ToastManager> toast_manager_;
347 std::unique_ptr<WindowCycleController> window_cycle_controller_; 351 std::unique_ptr<WindowCycleController> window_cycle_controller_;
348 std::unique_ptr<WindowSelectorController> window_selector_controller_; 352 std::unique_ptr<WindowSelectorController> window_selector_controller_;
349 353
350 base::ObserverList<LockStateObserver> lock_state_observers_; 354 base::ObserverList<LockStateObserver> lock_state_observers_;
351 355
352 bool simulate_modal_window_open_for_testing_ = false; 356 bool simulate_modal_window_open_for_testing_ = false;
353 357
354 #if defined(OS_CHROMEOS) 358 #if defined(OS_CHROMEOS)
355 std::unique_ptr<LogoutConfirmationController> logout_confirmation_controller_; 359 std::unique_ptr<LogoutConfirmationController> logout_confirmation_controller_;
356 #endif 360 #endif
357 }; 361 };
358 362
359 } // namespace ash 363 } // namespace ash
360 364
361 #endif // ASH_COMMON_WM_SHELL_H_ 365 #endif // ASH_COMMON_WM_SHELL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698