| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 "remoting/host/continue_window.h" |
| 6 |
| 5 #include <windows.h> | 7 #include <windows.h> |
| 6 | 8 |
| 7 #include "base/bind.h" | 9 #include "base/bind.h" |
| 8 #include "base/callback.h" | 10 #include "base/callback.h" |
| 9 #include "base/compiler_specific.h" | 11 #include "base/compiler_specific.h" |
| 10 #include "base/location.h" | 12 #include "base/location.h" |
| 11 #include "base/logging.h" | 13 #include "base/logging.h" |
| 12 #include "base/macros.h" | 14 #include "base/macros.h" |
| 15 #include "base/memory/ptr_util.h" |
| 13 #include "base/single_thread_task_runner.h" | 16 #include "base/single_thread_task_runner.h" |
| 14 #include "base/strings/utf_string_conversions.h" | 17 #include "base/strings/utf_string_conversions.h" |
| 15 #include "base/win/current_module.h" | 18 #include "base/win/current_module.h" |
| 16 #include "remoting/host/continue_window.h" | |
| 17 #include "remoting/host/win/core_resource.h" | 19 #include "remoting/host/win/core_resource.h" |
| 18 | 20 |
| 19 namespace remoting { | 21 namespace remoting { |
| 20 | 22 |
| 21 namespace { | 23 namespace { |
| 22 | 24 |
| 23 class ContinueWindowWin : public ContinueWindow { | 25 class ContinueWindowWin : public ContinueWindow { |
| 24 public: | 26 public: |
| 25 ContinueWindowWin(); | 27 ContinueWindowWin(); |
| 26 ~ContinueWindowWin() override; | 28 ~ContinueWindowWin() override; |
| (...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 121 | 123 |
| 122 if (hwnd_) { | 124 if (hwnd_) { |
| 123 ::DestroyWindow(hwnd_); | 125 ::DestroyWindow(hwnd_); |
| 124 hwnd_ = nullptr; | 126 hwnd_ = nullptr; |
| 125 } | 127 } |
| 126 } | 128 } |
| 127 | 129 |
| 128 } // namespace | 130 } // namespace |
| 129 | 131 |
| 130 // static | 132 // static |
| 131 scoped_ptr<HostWindow> HostWindow::CreateContinueWindow() { | 133 std::unique_ptr<HostWindow> HostWindow::CreateContinueWindow() { |
| 132 return make_scoped_ptr(new ContinueWindowWin()); | 134 return base::WrapUnique(new ContinueWindowWin()); |
| 133 } | 135 } |
| 134 | 136 |
| 135 } // namespace remoting | 137 } // namespace remoting |
| OLD | NEW |