OLD | NEW |
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/shell.h" | 7 #include "ash/shell.h" |
8 #include "ash/system/tray/system_tray_notifier.h" | 8 #include "ash/system/tray/system_tray_notifier.h" |
9 #include "base/macros.h" | 9 #include "base/macros.h" |
| 10 #include "base/memory/ptr_util.h" |
10 #include "remoting/host/client_session_control.h" | 11 #include "remoting/host/client_session_control.h" |
11 #include "remoting/host/host_window.h" | 12 #include "remoting/host/host_window.h" |
12 | 13 |
13 namespace remoting { | 14 namespace remoting { |
14 | 15 |
15 namespace { | 16 namespace { |
16 | 17 |
17 class DisconnectWindowAura : public HostWindow { | 18 class DisconnectWindowAura : public HostWindow { |
18 public: | 19 public: |
19 DisconnectWindowAura(); | 20 DisconnectWindowAura(); |
(...skipping 21 matching lines...) Expand all Loading... |
41 base::string16 helper_name; | 42 base::string16 helper_name; |
42 ash::Shell::GetInstance()->system_tray_notifier()->NotifyScreenShareStart( | 43 ash::Shell::GetInstance()->system_tray_notifier()->NotifyScreenShareStart( |
43 base::Bind(&ClientSessionControl::DisconnectSession, | 44 base::Bind(&ClientSessionControl::DisconnectSession, |
44 client_session_control, protocol::OK), | 45 client_session_control, protocol::OK), |
45 helper_name); | 46 helper_name); |
46 } | 47 } |
47 | 48 |
48 } // namespace | 49 } // namespace |
49 | 50 |
50 // static | 51 // static |
51 scoped_ptr<HostWindow> HostWindow::CreateDisconnectWindow() { | 52 std::unique_ptr<HostWindow> HostWindow::CreateDisconnectWindow() { |
52 return make_scoped_ptr(new DisconnectWindowAura()); | 53 return base::WrapUnique(new DisconnectWindowAura()); |
53 } | 54 } |
54 | 55 |
55 } // namespace remoting | 56 } // namespace remoting |
OLD | NEW |