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

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: Nits 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
« no previous file with comments | « ash/common/shell_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 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 ShelfWindowWatcher; 45 class ShelfWindowWatcher;
45 class ShellDelegate; 46 class ShellDelegate;
46 class ShellObserver; 47 class ShellObserver;
47 class SystemTrayDelegate; 48 class SystemTrayDelegate;
48 class SystemTrayNotifier; 49 class SystemTrayNotifier;
49 class ToastManager; 50 class ToastManager;
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after
110 111
111 NewWindowDelegate* new_window_delegate() { 112 NewWindowDelegate* new_window_delegate() {
112 return new_window_delegate_.get(); 113 return new_window_delegate_.get();
113 } 114 }
114 115
115 // NOTE: Prefer ScopedRootWindowForNewWindows when setting temporarily. 116 // NOTE: Prefer ScopedRootWindowForNewWindows when setting temporarily.
116 void set_root_window_for_new_windows(WmWindow* root) { 117 void set_root_window_for_new_windows(WmWindow* root) {
117 root_window_for_new_windows_ = root; 118 root_window_for_new_windows_ = root;
118 } 119 }
119 120
121 PaletteDelegate* palette_delegate() { return palette_delegate_.get(); }
122
120 ShelfDelegate* shelf_delegate() { return shelf_delegate_.get(); } 123 ShelfDelegate* shelf_delegate() { return shelf_delegate_.get(); }
121 124
122 ShelfModel* shelf_model() { return shelf_model_.get(); } 125 ShelfModel* shelf_model() { return shelf_model_.get(); }
123 126
124 SystemTrayNotifier* system_tray_notifier() { 127 SystemTrayNotifier* system_tray_notifier() {
125 return system_tray_notifier_.get(); 128 return system_tray_notifier_.get();
126 } 129 }
127 130
128 SystemTrayDelegate* system_tray_delegate() { 131 SystemTrayDelegate* system_tray_delegate() {
129 return system_tray_delegate_.get(); 132 return system_tray_delegate_.get();
(...skipping 210 matching lines...) Expand 10 before | Expand all | Expand 10 after
340 std::unique_ptr<AccessibilityDelegate> accessibility_delegate_; 343 std::unique_ptr<AccessibilityDelegate> accessibility_delegate_;
341 std::unique_ptr<BrightnessControlDelegate> brightness_control_delegate_; 344 std::unique_ptr<BrightnessControlDelegate> brightness_control_delegate_;
342 std::unique_ptr<FocusCycler> focus_cycler_; 345 std::unique_ptr<FocusCycler> focus_cycler_;
343 std::unique_ptr<KeyboardBrightnessControlDelegate> 346 std::unique_ptr<KeyboardBrightnessControlDelegate>
344 keyboard_brightness_control_delegate_; 347 keyboard_brightness_control_delegate_;
345 std::unique_ptr<KeyboardUI> keyboard_ui_; 348 std::unique_ptr<KeyboardUI> keyboard_ui_;
346 std::unique_ptr<MaximizeModeController> maximize_mode_controller_; 349 std::unique_ptr<MaximizeModeController> maximize_mode_controller_;
347 std::unique_ptr<MediaDelegate> media_delegate_; 350 std::unique_ptr<MediaDelegate> media_delegate_;
348 std::unique_ptr<MruWindowTracker> mru_window_tracker_; 351 std::unique_ptr<MruWindowTracker> mru_window_tracker_;
349 std::unique_ptr<NewWindowDelegate> new_window_delegate_; 352 std::unique_ptr<NewWindowDelegate> new_window_delegate_;
353 std::unique_ptr<PaletteDelegate> palette_delegate_;
350 std::unique_ptr<ShelfDelegate> shelf_delegate_; 354 std::unique_ptr<ShelfDelegate> shelf_delegate_;
351 std::unique_ptr<ShelfModel> shelf_model_; 355 std::unique_ptr<ShelfModel> shelf_model_;
352 std::unique_ptr<ShelfWindowWatcher> shelf_window_watcher_; 356 std::unique_ptr<ShelfWindowWatcher> shelf_window_watcher_;
353 std::unique_ptr<SystemTrayNotifier> system_tray_notifier_; 357 std::unique_ptr<SystemTrayNotifier> system_tray_notifier_;
354 std::unique_ptr<SystemTrayDelegate> system_tray_delegate_; 358 std::unique_ptr<SystemTrayDelegate> system_tray_delegate_;
355 std::unique_ptr<ToastManager> toast_manager_; 359 std::unique_ptr<ToastManager> toast_manager_;
356 std::unique_ptr<WindowCycleController> window_cycle_controller_; 360 std::unique_ptr<WindowCycleController> window_cycle_controller_;
357 std::unique_ptr<WindowSelectorController> window_selector_controller_; 361 std::unique_ptr<WindowSelectorController> window_selector_controller_;
358 362
359 base::ObserverList<LockStateObserver> lock_state_observers_; 363 base::ObserverList<LockStateObserver> lock_state_observers_;
360 364
361 // See comment for GetRootWindowForNewWindows(). 365 // See comment for GetRootWindowForNewWindows().
362 WmWindow* root_window_for_new_windows_ = nullptr; 366 WmWindow* root_window_for_new_windows_ = nullptr;
363 WmWindow* scoped_root_window_for_new_windows_ = nullptr; 367 WmWindow* scoped_root_window_for_new_windows_ = nullptr;
364 368
365 bool simulate_modal_window_open_for_testing_ = false; 369 bool simulate_modal_window_open_for_testing_ = false;
366 370
367 #if defined(OS_CHROMEOS) 371 #if defined(OS_CHROMEOS)
368 std::unique_ptr<LogoutConfirmationController> logout_confirmation_controller_; 372 std::unique_ptr<LogoutConfirmationController> logout_confirmation_controller_;
369 #endif 373 #endif
370 }; 374 };
371 375
372 } // namespace ash 376 } // namespace ash
373 377
374 #endif // ASH_COMMON_WM_SHELL_H_ 378 #endif // ASH_COMMON_WM_SHELL_H_
OLDNEW
« no previous file with comments | « ash/common/shell_delegate.h ('k') | ash/common/wm_shell.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698