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 <stddef.h> |
5 #include <windows.h> | 6 #include <windows.h> |
6 #include <stddef.h> | |
7 | 7 |
8 #include "base/compiler_specific.h" | 8 #include "base/compiler_specific.h" |
9 #include "base/logging.h" | 9 #include "base/logging.h" |
10 #include "base/macros.h" | 10 #include "base/macros.h" |
| 11 #include "base/memory/ptr_util.h" |
11 #include "base/strings/string_util.h" | 12 #include "base/strings/string_util.h" |
12 #include "base/strings/utf_string_conversions.h" | 13 #include "base/strings/utf_string_conversions.h" |
13 #include "base/win/current_module.h" | 14 #include "base/win/current_module.h" |
14 #include "base/win/scoped_gdi_object.h" | 15 #include "base/win/scoped_gdi_object.h" |
15 #include "base/win/scoped_hdc.h" | 16 #include "base/win/scoped_hdc.h" |
16 #include "base/win/scoped_select_object.h" | 17 #include "base/win/scoped_select_object.h" |
17 #include "remoting/host/client_session_control.h" | 18 #include "remoting/host/client_session_control.h" |
18 #include "remoting/host/host_window.h" | 19 #include "remoting/host/host_window.h" |
19 #include "remoting/host/win/core_resource.h" | 20 #include "remoting/host/win/core_resource.h" |
20 | 21 |
(...skipping 367 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
388 return false; | 389 return false; |
389 if (!SetWindowRgn(hwnd_, rgn, TRUE)) | 390 if (!SetWindowRgn(hwnd_, rgn, TRUE)) |
390 return false; | 391 return false; |
391 | 392 |
392 return true; | 393 return true; |
393 } | 394 } |
394 | 395 |
395 } // namespace | 396 } // namespace |
396 | 397 |
397 // static | 398 // static |
398 scoped_ptr<HostWindow> HostWindow::CreateDisconnectWindow() { | 399 std::unique_ptr<HostWindow> HostWindow::CreateDisconnectWindow() { |
399 return make_scoped_ptr(new DisconnectWindowWin()); | 400 return base::WrapUnique(new DisconnectWindowWin()); |
400 } | 401 } |
401 | 402 |
402 } // namespace remoting | 403 } // namespace remoting |
OLD | NEW |