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

Unified Diff: chrome/browser/ui/views/profiles/user_manager_view.cc

Issue 1865213004: Convert //chrome/browser/ui from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 years, 8 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
Index: chrome/browser/ui/views/profiles/user_manager_view.cc
diff --git a/chrome/browser/ui/views/profiles/user_manager_view.cc b/chrome/browser/ui/views/profiles/user_manager_view.cc
index 213aee7b67ef0e3bfd9b90f661a23de1c3d1f1c3..46039d4f22f9e9c10e7b5d2235120b1fe908bce8 100644
--- a/chrome/browser/ui/views/profiles/user_manager_view.cc
+++ b/chrome/browser/ui/views/profiles/user_manager_view.cc
@@ -5,6 +5,7 @@
#include "chrome/browser/ui/views/profiles/user_manager_view.h"
#include "base/callback.h"
+#include "base/memory/ptr_util.h"
#include "base/time/time.h"
#include "build/build_config.h"
#include "chrome/browser/browser_process.h"
@@ -186,11 +187,9 @@ void UserManager::Show(
UserManagerView* user_manager = new UserManagerView();
user_manager->set_user_manager_started_showing(base::Time::Now());
profiles::CreateSystemProfileForUserManager(
- profile_path_to_focus,
- tutorial_mode,
- profile_open_action,
+ profile_path_to_focus, tutorial_mode, profile_open_action,
base::Bind(&UserManagerView::OnSystemProfileCreated,
- base::Passed(make_scoped_ptr(user_manager)),
+ base::Passed(base::WrapUnique(user_manager)),
base::Owned(new base::AutoReset<bool>(
&instance_under_construction_, true))));
}
@@ -259,7 +258,7 @@ UserManagerView::~UserManagerView() {
// static
void UserManagerView::OnSystemProfileCreated(
- scoped_ptr<UserManagerView> instance,
+ std::unique_ptr<UserManagerView> instance,
base::AutoReset<bool>* pending,
Profile* system_profile,
const std::string& url) {

Powered by Google App Engine
This is Rietveld 408576698