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

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

Issue 2211463002: mash: Move ShelfWindowWatcher[ItemDelegate] to ash/common. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Add TODO comments with bug for WmWindowMus ShelfItemDetails support. 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/shelf/shelf_window_watcher_unittest.cc ('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 23 matching lines...) Expand all
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 ScopedDisableInternalMouseAndKeyboard; 40 class ScopedDisableInternalMouseAndKeyboard;
41 class SessionStateDelegate; 41 class SessionStateDelegate;
42 class ShelfDelegate; 42 class ShelfDelegate;
43 class ShelfModel; 43 class ShelfModel;
44 class ShelfWindowWatcher;
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;
50 class WindowCycleEventFilter; 51 class WindowCycleEventFilter;
51 class WindowResizer; 52 class WindowResizer;
52 class WindowSelectorController; 53 class WindowSelectorController;
53 class WmActivationObserver; 54 class WmActivationObserver;
(...skipping 287 matching lines...) Expand 10 before | Expand all | Expand 10 after
341 std::unique_ptr<FocusCycler> focus_cycler_; 342 std::unique_ptr<FocusCycler> focus_cycler_;
342 std::unique_ptr<KeyboardBrightnessControlDelegate> 343 std::unique_ptr<KeyboardBrightnessControlDelegate>
343 keyboard_brightness_control_delegate_; 344 keyboard_brightness_control_delegate_;
344 std::unique_ptr<KeyboardUI> keyboard_ui_; 345 std::unique_ptr<KeyboardUI> keyboard_ui_;
345 std::unique_ptr<MaximizeModeController> maximize_mode_controller_; 346 std::unique_ptr<MaximizeModeController> maximize_mode_controller_;
346 std::unique_ptr<MediaDelegate> media_delegate_; 347 std::unique_ptr<MediaDelegate> media_delegate_;
347 std::unique_ptr<MruWindowTracker> mru_window_tracker_; 348 std::unique_ptr<MruWindowTracker> mru_window_tracker_;
348 std::unique_ptr<NewWindowDelegate> new_window_delegate_; 349 std::unique_ptr<NewWindowDelegate> new_window_delegate_;
349 std::unique_ptr<ShelfDelegate> shelf_delegate_; 350 std::unique_ptr<ShelfDelegate> shelf_delegate_;
350 std::unique_ptr<ShelfModel> shelf_model_; 351 std::unique_ptr<ShelfModel> shelf_model_;
352 std::unique_ptr<ShelfWindowWatcher> shelf_window_watcher_;
351 std::unique_ptr<SystemTrayNotifier> system_tray_notifier_; 353 std::unique_ptr<SystemTrayNotifier> system_tray_notifier_;
352 std::unique_ptr<SystemTrayDelegate> system_tray_delegate_; 354 std::unique_ptr<SystemTrayDelegate> system_tray_delegate_;
353 std::unique_ptr<ToastManager> toast_manager_; 355 std::unique_ptr<ToastManager> toast_manager_;
354 std::unique_ptr<WindowCycleController> window_cycle_controller_; 356 std::unique_ptr<WindowCycleController> window_cycle_controller_;
355 std::unique_ptr<WindowSelectorController> window_selector_controller_; 357 std::unique_ptr<WindowSelectorController> window_selector_controller_;
356 358
357 base::ObserverList<LockStateObserver> lock_state_observers_; 359 base::ObserverList<LockStateObserver> lock_state_observers_;
358 360
359 // See comment for GetRootWindowForNewWindows(). 361 // See comment for GetRootWindowForNewWindows().
360 WmWindow* root_window_for_new_windows_ = nullptr; 362 WmWindow* root_window_for_new_windows_ = nullptr;
361 WmWindow* scoped_root_window_for_new_windows_ = nullptr; 363 WmWindow* scoped_root_window_for_new_windows_ = nullptr;
362 364
363 bool simulate_modal_window_open_for_testing_ = false; 365 bool simulate_modal_window_open_for_testing_ = false;
364 366
365 #if defined(OS_CHROMEOS) 367 #if defined(OS_CHROMEOS)
366 std::unique_ptr<LogoutConfirmationController> logout_confirmation_controller_; 368 std::unique_ptr<LogoutConfirmationController> logout_confirmation_controller_;
367 #endif 369 #endif
368 }; 370 };
369 371
370 } // namespace ash 372 } // namespace ash
371 373
372 #endif // ASH_COMMON_WM_SHELL_H_ 374 #endif // ASH_COMMON_WM_SHELL_H_
OLDNEW
« no previous file with comments | « ash/common/shelf/shelf_window_watcher_unittest.cc ('k') | ash/common/wm_shell.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698