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

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

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.h
diff --git a/chrome/browser/ui/views/profiles/user_manager_view.h b/chrome/browser/ui/views/profiles/user_manager_view.h
index dcf20c7011dc28ec4cf24bd9abd91e7388a163ed..cbc13644603d7dbad3310f430a36e29497d35a7d 100644
--- a/chrome/browser/ui/views/profiles/user_manager_view.h
+++ b/chrome/browser/ui/views/profiles/user_manager_view.h
@@ -9,7 +9,6 @@
#include "base/auto_reset.h"
#include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/profiles/profile_window.h"
#include "ui/views/window/dialog_delegate.h"
@@ -28,7 +27,7 @@ class UserManagerView : public views::DialogDelegateView {
// Creates a new UserManagerView instance for the |system_profile| and shows
// the |url|.
- static void OnSystemProfileCreated(scoped_ptr<UserManagerView> instance,
+ static void OnSystemProfileCreated(std::unique_ptr<UserManagerView> instance,
base::AutoReset<bool>* pending,
Profile* system_profile,
const std::string& url);
@@ -64,7 +63,7 @@ class UserManagerView : public views::DialogDelegateView {
views::WebView* web_view_;
- scoped_ptr<ScopedKeepAlive> keep_alive_;
+ std::unique_ptr<ScopedKeepAlive> keep_alive_;
base::Time user_manager_started_showing_;
DISALLOW_COPY_AND_ASSIGN(UserManagerView);

Powered by Google App Engine
This is Rietveld 408576698