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

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

Issue 2060633002: mash: Introduce WmSystemTrayNotifier for //ash/common (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@testupdate
Patch Set: rebase 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
« no previous file with comments | « ash/common/wm_shell.h ('k') | ash/system/tray/system_tray_notifier.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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" 7 #include "ash/common/system/tray/system_tray_delegate.h"
8 #include "ash/common/system/tray/wm_system_tray_notifier.h"
8 #include "base/logging.h" 9 #include "base/logging.h"
9 10
10 namespace ash { 11 namespace ash {
11 12
12 // static 13 // static
13 WmShell* WmShell::instance_ = nullptr; 14 WmShell* WmShell::instance_ = nullptr;
14 15
15 // static 16 // static
16 void WmShell::Set(WmShell* instance) { 17 void WmShell::Set(WmShell* instance) {
17 instance_ = instance; 18 instance_ = instance;
18 } 19 }
19 20
20 // static 21 // static
21 WmShell* WmShell::Get() { 22 WmShell* WmShell::Get() {
22 return instance_; 23 return instance_;
23 } 24 }
24 25
25 WmShell::WmShell() {} 26 WmShell::WmShell() : system_tray_notifier_(new WmSystemTrayNotifier) {}
26 27
27 WmShell::~WmShell() {} 28 WmShell::~WmShell() {}
28 29
29 void WmShell::SetSystemTrayDelegate( 30 void WmShell::SetSystemTrayDelegate(
30 std::unique_ptr<SystemTrayDelegate> delegate) { 31 std::unique_ptr<SystemTrayDelegate> delegate) {
31 if (delegate) { 32 if (delegate) {
32 DCHECK(!system_tray_delegate_); 33 DCHECK(!system_tray_delegate_);
33 // TODO(jamescook): Create via ShellDelegate once it moves to //ash/common. 34 // TODO(jamescook): Create via ShellDelegate once it moves to //ash/common.
34 system_tray_delegate_ = std::move(delegate); 35 system_tray_delegate_ = std::move(delegate);
35 system_tray_delegate_->Initialize(); 36 system_tray_delegate_->Initialize();
36 } else { 37 } else {
37 DCHECK(system_tray_delegate_); 38 DCHECK(system_tray_delegate_);
38 system_tray_delegate_->Shutdown(); 39 system_tray_delegate_->Shutdown();
39 system_tray_delegate_.reset(); 40 system_tray_delegate_.reset();
40 } 41 }
41 } 42 }
42 43
43 } // namespace ash 44 } // namespace ash
OLDNEW
« no previous file with comments | « ash/common/wm_shell.h ('k') | ash/system/tray/system_tray_notifier.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698