| 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 #include "ash/common/wm_shell.h" | 5 #include "ash/common/wm_shell.h" |
| 6 | 6 |
| 7 #include "ash/common/focus_cycler.h" |
| 7 #include "ash/common/system/tray/system_tray_delegate.h" | 8 #include "ash/common/system/tray/system_tray_delegate.h" |
| 8 #include "ash/common/system/tray/wm_system_tray_notifier.h" | 9 #include "ash/common/system/tray/wm_system_tray_notifier.h" |
| 9 #include "base/logging.h" | 10 #include "base/logging.h" |
| 10 | 11 |
| 11 namespace ash { | 12 namespace ash { |
| 12 | 13 |
| 13 // static | 14 // static |
| 14 WmShell* WmShell::instance_ = nullptr; | 15 WmShell* WmShell::instance_ = nullptr; |
| 15 | 16 |
| 16 // static | 17 // static |
| 17 void WmShell::Set(WmShell* instance) { | 18 void WmShell::Set(WmShell* instance) { |
| 18 instance_ = instance; | 19 instance_ = instance; |
| 19 } | 20 } |
| 20 | 21 |
| 21 // static | 22 // static |
| 22 WmShell* WmShell::Get() { | 23 WmShell* WmShell::Get() { |
| 23 return instance_; | 24 return instance_; |
| 24 } | 25 } |
| 25 | 26 |
| 26 WmShell::WmShell() : system_tray_notifier_(new WmSystemTrayNotifier) {} | 27 WmShell::WmShell() |
| 28 : focus_cycler_(new FocusCycler), |
| 29 system_tray_notifier_(new WmSystemTrayNotifier) {} |
| 27 | 30 |
| 28 WmShell::~WmShell() {} | 31 WmShell::~WmShell() {} |
| 29 | 32 |
| 30 void WmShell::SetSystemTrayDelegate( | 33 void WmShell::SetSystemTrayDelegate( |
| 31 std::unique_ptr<SystemTrayDelegate> delegate) { | 34 std::unique_ptr<SystemTrayDelegate> delegate) { |
| 32 if (delegate) { | 35 if (delegate) { |
| 33 DCHECK(!system_tray_delegate_); | 36 DCHECK(!system_tray_delegate_); |
| 34 // TODO(jamescook): Create via ShellDelegate once it moves to //ash/common. | 37 // TODO(jamescook): Create via ShellDelegate once it moves to //ash/common. |
| 35 system_tray_delegate_ = std::move(delegate); | 38 system_tray_delegate_ = std::move(delegate); |
| 36 system_tray_delegate_->Initialize(); | 39 system_tray_delegate_->Initialize(); |
| 37 } else { | 40 } else { |
| 38 DCHECK(system_tray_delegate_); | 41 DCHECK(system_tray_delegate_); |
| 39 system_tray_delegate_->Shutdown(); | 42 system_tray_delegate_->Shutdown(); |
| 40 system_tray_delegate_.reset(); | 43 system_tray_delegate_.reset(); |
| 41 } | 44 } |
| 42 } | 45 } |
| 43 | 46 |
| 44 } // namespace ash | 47 } // namespace ash |
| OLD | NEW |