| 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 312 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 418 | 419 |
| 419 const scoped_refptr<base::SequencedWorkerPool>& blocking_pool() { | 420 const scoped_refptr<base::SequencedWorkerPool>& blocking_pool() { |
| 420 return blocking_pool_; | 421 return blocking_pool_; |
| 421 } | 422 } |
| 422 | 423 |
| 423 #if defined(OS_CHROMEOS) | 424 #if defined(OS_CHROMEOS) |
| 424 LogoutConfirmationController* logout_confirmation_controller() { | 425 LogoutConfirmationController* logout_confirmation_controller() { |
| 425 return logout_confirmation_controller_.get(); | 426 return logout_confirmation_controller_.get(); |
| 426 } | 427 } |
| 427 | 428 |
| 429 VpnList* vpn_list() { return vpn_list_.get(); } |
| 430 |
| 428 // TODO(jamescook): Remove this when VirtualKeyboardController has been moved. | 431 // TODO(jamescook): Remove this when VirtualKeyboardController has been moved. |
| 429 virtual void ToggleIgnoreExternalKeyboard() = 0; | 432 virtual void ToggleIgnoreExternalKeyboard() = 0; |
| 430 | 433 |
| 431 // Enable or disable the laser pointer. | 434 // Enable or disable the laser pointer. |
| 432 virtual void SetLaserPointerEnabled(bool enabled) = 0; | 435 virtual void SetLaserPointerEnabled(bool enabled) = 0; |
| 433 #endif | 436 #endif |
| 434 | 437 |
| 435 protected: | 438 protected: |
| 436 explicit WmShell(std::unique_ptr<ShellDelegate> shell_delegate); | 439 explicit WmShell(std::unique_ptr<ShellDelegate> shell_delegate); |
| 437 virtual ~WmShell(); | 440 virtual ~WmShell(); |
| (...skipping 68 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 |