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

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

Issue 2058173002: mash: Move SystemTrayDelegate ownership to WmShell (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: review feedback Created 4 years, 6 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
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 #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 #include "base/logging.h"
9
7 namespace ash { 10 namespace ash {
8 11
9 // static 12 // static
10 WmShell* WmShell::instance_ = nullptr; 13 WmShell* WmShell::instance_ = nullptr;
11 14
12 // static 15 // static
13 void WmShell::Set(WmShell* instance) { 16 void WmShell::Set(WmShell* instance) {
14 instance_ = instance; 17 instance_ = instance;
15 } 18 }
16 19
17 // static 20 // static
18 WmShell* WmShell::Get() { 21 WmShell* WmShell::Get() {
19 return instance_; 22 return instance_;
20 } 23 }
21 24
25 WmShell::WmShell() {}
26
27 WmShell::~WmShell() {}
28
29 void WmShell::SetSystemTrayDelegate(
30 std::unique_ptr<SystemTrayDelegate> delegate) {
31 if (delegate) {
32 DCHECK(!system_tray_delegate_);
33 // TODO(jamescook): Create via ShellDelegate once it moves to //ash/common.
34 system_tray_delegate_ = std::move(delegate);
35 system_tray_delegate_->Initialize();
36 } else {
37 DCHECK(system_tray_delegate_);
38 system_tray_delegate_->Shutdown();
39 system_tray_delegate_.reset();
40 }
41 }
42
22 } // namespace ash 43 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698