| 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 <gtk/gtk.h> | 5 #include <gtk/gtk.h> |
| 6 #include <math.h> | 6 #include <math.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 "remoting/base/string_resources.h" | 14 #include "remoting/base/string_resources.h" |
| 14 #include "remoting/host/client_session_control.h" | 15 #include "remoting/host/client_session_control.h" |
| 15 #include "remoting/host/host_window.h" | 16 #include "remoting/host/host_window.h" |
| 16 #include "ui/base/glib/glib_signal.h" | 17 #include "ui/base/glib/glib_signal.h" |
| 17 #include "ui/base/l10n/l10n_util.h" | 18 #include "ui/base/l10n/l10n_util.h" |
| 18 | 19 |
| 19 namespace remoting { | 20 namespace remoting { |
| 20 | 21 |
| (...skipping 260 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 281 event->button, | 282 event->button, |
| 282 event->x_root, | 283 event->x_root, |
| 283 event->y_root, | 284 event->y_root, |
| 284 event->time); | 285 event->time); |
| 285 return FALSE; | 286 return FALSE; |
| 286 } | 287 } |
| 287 | 288 |
| 288 } // namespace | 289 } // namespace |
| 289 | 290 |
| 290 // static | 291 // static |
| 291 scoped_ptr<HostWindow> HostWindow::CreateDisconnectWindow() { | 292 std::unique_ptr<HostWindow> HostWindow::CreateDisconnectWindow() { |
| 292 return make_scoped_ptr(new DisconnectWindowGtk()); | 293 return base::WrapUnique(new DisconnectWindowGtk()); |
| 293 } | 294 } |
| 294 | 295 |
| 295 } // namespace remoting | 296 } // namespace remoting |
| OLD | NEW |