| OLD | NEW |
| 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 75 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 86 class NewWindowClient; | 86 class NewWindowClient; |
| 87 } | 87 } |
| 88 | 88 |
| 89 namespace wm { | 89 namespace wm { |
| 90 class MaximizeModeEventHandler; | 90 class MaximizeModeEventHandler; |
| 91 class WindowState; | 91 class WindowState; |
| 92 } | 92 } |
| 93 | 93 |
| 94 #if defined(OS_CHROMEOS) | 94 #if defined(OS_CHROMEOS) |
| 95 class LogoutConfirmationController; | 95 class LogoutConfirmationController; |
| 96 class VpnList; |
| 96 #endif | 97 #endif |
| 97 | 98 |
| 98 // Similar to ash::Shell. Eventually the two will be merged. | 99 // Similar to ash::Shell. Eventually the two will be merged. |
| 99 class ASH_EXPORT WmShell { | 100 class ASH_EXPORT WmShell { |
| 100 public: | 101 public: |
| 101 // This is necessary for a handful of places that is difficult to plumb | 102 // This is necessary for a handful of places that is difficult to plumb |
| 102 // through context. | 103 // through context. |
| 103 static void Set(WmShell* instance); | 104 static void Set(WmShell* instance); |
| 104 static WmShell* Get(); | 105 static WmShell* Get(); |
| 105 static bool HasInstance() { return instance_ != nullptr; } | 106 static bool HasInstance() { return instance_ != nullptr; } |
| (...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 169 SystemTrayNotifier* system_tray_notifier() { | 170 SystemTrayNotifier* system_tray_notifier() { |
| 170 return system_tray_notifier_.get(); | 171 return system_tray_notifier_.get(); |
| 171 } | 172 } |
| 172 | 173 |
| 173 SystemTrayDelegate* system_tray_delegate() { | 174 SystemTrayDelegate* system_tray_delegate() { |
| 174 return system_tray_delegate_.get(); | 175 return system_tray_delegate_.get(); |
| 175 } | 176 } |
| 176 | 177 |
| 177 ToastManager* toast_manager() { return toast_manager_.get(); } | 178 ToastManager* toast_manager() { return toast_manager_.get(); } |
| 178 | 179 |
| 180 VpnList* vpn_list() { return vpn_list_.get(); } |
| 181 |
| 179 WallpaperController* wallpaper_controller() { | 182 WallpaperController* wallpaper_controller() { |
| 180 return wallpaper_controller_.get(); | 183 return wallpaper_controller_.get(); |
| 181 } | 184 } |
| 182 | 185 |
| 183 WallpaperDelegate* wallpaper_delegate() { return wallpaper_delegate_.get(); } | 186 WallpaperDelegate* wallpaper_delegate() { return wallpaper_delegate_.get(); } |
| 184 | 187 |
| 185 WindowCycleController* window_cycle_controller() { | 188 WindowCycleController* window_cycle_controller() { |
| 186 return window_cycle_controller_.get(); | 189 return window_cycle_controller_.get(); |
| 187 } | 190 } |
| 188 | 191 |
| (...skipping 317 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 506 // See comment for GetRootWindowForNewWindows(). | 509 // See comment for GetRootWindowForNewWindows(). |
| 507 WmWindow* root_window_for_new_windows_ = nullptr; | 510 WmWindow* root_window_for_new_windows_ = nullptr; |
| 508 WmWindow* scoped_root_window_for_new_windows_ = nullptr; | 511 WmWindow* scoped_root_window_for_new_windows_ = nullptr; |
| 509 | 512 |
| 510 bool simulate_modal_window_open_for_testing_ = false; | 513 bool simulate_modal_window_open_for_testing_ = false; |
| 511 | 514 |
| 512 scoped_refptr<base::SequencedWorkerPool> blocking_pool_; | 515 scoped_refptr<base::SequencedWorkerPool> blocking_pool_; |
| 513 | 516 |
| 514 #if defined(OS_CHROMEOS) | 517 #if defined(OS_CHROMEOS) |
| 515 std::unique_ptr<LogoutConfirmationController> logout_confirmation_controller_; | 518 std::unique_ptr<LogoutConfirmationController> logout_confirmation_controller_; |
| 519 std::unique_ptr<VpnList> vpn_list_; |
| 516 #endif | 520 #endif |
| 517 }; | 521 }; |
| 518 | 522 |
| 519 } // namespace ash | 523 } // namespace ash |
| 520 | 524 |
| 521 #endif // ASH_COMMON_WM_SHELL_H_ | 525 #endif // ASH_COMMON_WM_SHELL_H_ |
| OLD | NEW |