Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(979)

Unified Diff: mash/login/login.cc

Issue 1857623003: convert //mash to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « mash/init/init.cc ('k') | mash/quick_launch/quick_launch_application.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mash/login/login.cc
diff --git a/mash/login/login.cc b/mash/login/login.cc
index 78cddd9355d4eea8dd7082d15bb7f0149e9a63a9..1149493d15637a4f69ffe053336530f1feb92232 100644
--- a/mash/login/login.cc
+++ b/mash/login/login.cc
@@ -5,6 +5,7 @@
#include "mash/login/login.h"
#include <map>
+#include <memory>
#include "base/guid.h"
#include "base/macros.h"
@@ -123,7 +124,7 @@ class UI : public views::WidgetDelegateView,
const std::string user_id_2_;
views::LabelButton* login_button_1_;
views::LabelButton* login_button_2_;
- scoped_ptr<mojo::Connection> window_manager_connection_;
+ std::unique_ptr<mojo::Connection> window_manager_connection_;
DISALLOW_COPY_AND_ASSIGN(UI);
};
@@ -177,10 +178,10 @@ class Login : public mojo::ShellClient,
mojo::Connector* connector_;
mojo::TracingImpl tracing_;
- scoped_ptr<views::AuraInit> aura_init_;
+ std::unique_ptr<views::AuraInit> aura_init_;
mojo::BindingSet<mojom::Login> bindings_;
mus::mojom::UserAccessManagerPtr user_access_manager_;
- scoped_ptr<mojo::Connection> window_manager_connection_;
+ std::unique_ptr<mojo::Connection> window_manager_connection_;
DISALLOW_COPY_AND_ASSIGN(Login);
};
« no previous file with comments | « mash/init/init.cc ('k') | mash/quick_launch/quick_launch_application.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698