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

Unified Diff: chrome/browser/chromeos/login/lock/webui_screen_locker.h

Issue 1870793002: Convert //chrome/browser/chromeos 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/chromeos/login/lock/webui_screen_locker.h
diff --git a/chrome/browser/chromeos/login/lock/webui_screen_locker.h b/chrome/browser/chromeos/login/lock/webui_screen_locker.h
index a3335e5b1c71a7bcd8f19b1537de294fa1ac098c..72b55133c4cce0f1f073db06bc50c1dbd3c1de66 100644
--- a/chrome/browser/chromeos/login/lock/webui_screen_locker.h
+++ b/chrome/browser/chromeos/login/lock/webui_screen_locker.h
@@ -7,13 +7,13 @@
#include <stdint.h>
+#include <memory>
#include <string>
#include "ash/shell_delegate.h"
#include "ash/wm/lock_state_observer.h"
#include "base/compiler_specific.h"
#include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
#include "base/memory/weak_ptr.h"
#include "base/time/time.h"
#include "chrome/browser/chromeos/login/lock/screen_locker_delegate.h"
@@ -153,10 +153,10 @@ class WebUIScreenLocker : public WebUILoginView,
views::Widget* lock_window_;
// Sign-in Screen controller instance (owns login screens).
- scoped_ptr<SignInScreenController> signin_screen_controller_;
+ std::unique_ptr<SignInScreenController> signin_screen_controller_;
// Login UI implementation instance.
- scoped_ptr<WebUILoginDisplay> login_display_;
+ std::unique_ptr<WebUILoginDisplay> login_display_;
// Tracks when the lock window is displayed and ready.
bool lock_ready_;
@@ -167,7 +167,7 @@ class WebUIScreenLocker : public WebUILoginView,
// Time when lock was initiated, required for metrics.
base::TimeTicks lock_time_;
- scoped_ptr<login::NetworkStateHelper> network_state_helper_;
+ std::unique_ptr<login::NetworkStateHelper> network_state_helper_;
// True is subscribed as keyboard controller observer.
bool is_observing_keyboard_;

Powered by Google App Engine
This is Rietveld 408576698