| 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/system/tray/system_tray_delegate.h" |
| 8 |
| 7 namespace ash { | 9 namespace ash { |
| 8 | 10 |
| 9 // static | 11 // static |
| 10 WmShell* WmShell::instance_ = nullptr; | 12 WmShell* WmShell::instance_ = nullptr; |
| 11 | 13 |
| 12 // static | 14 // static |
| 13 void WmShell::Set(WmShell* instance) { | 15 void WmShell::Set(WmShell* instance) { |
| 14 instance_ = instance; | 16 instance_ = instance; |
| 15 } | 17 } |
| 16 | 18 |
| 17 // static | 19 // static |
| 18 WmShell* WmShell::Get() { | 20 WmShell* WmShell::Get() { |
| 19 return instance_; | 21 return instance_; |
| 20 } | 22 } |
| 21 | 23 |
| 24 WmShell::WmShell() {} |
| 25 |
| 26 WmShell::~WmShell() {} |
| 27 |
| 28 void WmShell::SetSystemTrayDelegate( |
| 29 std::unique_ptr<SystemTrayDelegate> delegate) { |
| 30 // TODO(jamescook): Create via ShellDelegate once it moves to //ash/common. |
| 31 system_tray_delegate_ = std::move(delegate); |
| 32 } |
| 33 |
| 22 } // namespace ash | 34 } // namespace ash |
| OLD | NEW |