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

Side by Side Diff: remoting/host/disconnect_window_chromeos.cc

Issue 2775973002: Promotes more accessors from WmShell to Shell (Closed)
Patch Set: feedback Created 3 years, 9 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 | « components/exo/wm_helper_ash.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 <string> 5 #include <string>
6 6
7 #include "ash/common/system/tray/system_tray_notifier.h" 7 #include "ash/common/system/tray/system_tray_notifier.h"
8 #include "ash/common/wm_shell.h" 8 #include "ash/shell.h"
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/macros.h" 10 #include "base/macros.h"
11 #include "base/memory/ptr_util.h" 11 #include "base/memory/ptr_util.h"
12 #include "remoting/host/client_session_control.h" 12 #include "remoting/host/client_session_control.h"
13 #include "remoting/host/host_window.h" 13 #include "remoting/host/host_window.h"
14 14
15 namespace remoting { 15 namespace remoting {
16 16
17 namespace { 17 namespace {
18 18
19 class DisconnectWindowAura : public HostWindow { 19 class DisconnectWindowAura : public HostWindow {
20 public: 20 public:
21 DisconnectWindowAura(); 21 DisconnectWindowAura();
22 ~DisconnectWindowAura() override; 22 ~DisconnectWindowAura() override;
23 23
24 // HostWindow interface. 24 // HostWindow interface.
25 void Start(const base::WeakPtr<ClientSessionControl>& client_session_control) 25 void Start(const base::WeakPtr<ClientSessionControl>& client_session_control)
26 override; 26 override;
27 27
28 private: 28 private:
29 DISALLOW_COPY_AND_ASSIGN(DisconnectWindowAura); 29 DISALLOW_COPY_AND_ASSIGN(DisconnectWindowAura);
30 }; 30 };
31 31
32 DisconnectWindowAura::DisconnectWindowAura() {} 32 DisconnectWindowAura::DisconnectWindowAura() {}
33 33
34 DisconnectWindowAura::~DisconnectWindowAura() { 34 DisconnectWindowAura::~DisconnectWindowAura() {
35 ash::WmShell::Get()->system_tray_notifier()->NotifyScreenShareStop(); 35 ash::Shell::Get()->system_tray_notifier()->NotifyScreenShareStop();
36 } 36 }
37 37
38 void DisconnectWindowAura::Start( 38 void DisconnectWindowAura::Start(
39 const base::WeakPtr<ClientSessionControl>& client_session_control) { 39 const base::WeakPtr<ClientSessionControl>& client_session_control) {
40 // TODO(kelvinp): Clean up the NotifyScreenShareStart interface when we 40 // TODO(kelvinp): Clean up the NotifyScreenShareStart interface when we
41 // completely retire Hangout Remote Desktop v1. 41 // completely retire Hangout Remote Desktop v1.
42 base::string16 helper_name; 42 base::string16 helper_name;
43 ash::WmShell::Get()->system_tray_notifier()->NotifyScreenShareStart( 43 ash::Shell::Get()->system_tray_notifier()->NotifyScreenShareStart(
44 base::Bind(&ClientSessionControl::DisconnectSession, 44 base::Bind(&ClientSessionControl::DisconnectSession,
45 client_session_control, protocol::OK), 45 client_session_control, protocol::OK),
46 helper_name); 46 helper_name);
47 } 47 }
48 48
49 } // namespace 49 } // namespace
50 50
51 // static 51 // static
52 std::unique_ptr<HostWindow> HostWindow::CreateDisconnectWindow() { 52 std::unique_ptr<HostWindow> HostWindow::CreateDisconnectWindow() {
53 return base::MakeUnique<DisconnectWindowAura>(); 53 return base::MakeUnique<DisconnectWindowAura>();
54 } 54 }
55 55
56 } // namespace remoting 56 } // namespace remoting
OLDNEW
« no previous file with comments | « components/exo/wm_helper_ash.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698