Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / remoting / host / disconnect_window_linux.cc

diff --git a/src/remoting/host/disconnect_window_linux.cc b/src/remoting/host/disconnect_window_linux.cc
index 4a9c36e..5680e1d 100644 (file)
--- a/src/remoting/host/disconnect_window_linux.cc
+++ b/src/remoting/host/disconnect_window_linux.cc
@@ -22,12 +22,11 @@ namespace {
 class DisconnectWindowGtk : public HostWindow {
  public:
   DisconnectWindowGtk();
-  virtual ~DisconnectWindowGtk();
+  ~DisconnectWindowGtk() override;
 
   // HostWindow overrides.
-  virtual void Start(
-      const base::WeakPtr<ClientSessionControl>& client_session_control)
-      OVERRIDE;
+  void Start(const base::WeakPtr<ClientSessionControl>& client_session_control)
+      override;
 
  private:
   CHROMEG_CALLBACK_1(DisconnectWindowGtk, gboolean, OnDelete,
@@ -289,7 +288,7 @@ gboolean DisconnectWindowGtk::OnButtonPress(GtkWidget* widget,
 
 // static
 scoped_ptr<HostWindow> HostWindow::CreateDisconnectWindow() {
-  return scoped_ptr<HostWindow>(new DisconnectWindowGtk());
+  return make_scoped_ptr(new DisconnectWindowGtk());
 }
 
 }  // namespace remoting