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

Unified Diff: chrome/browser/chromeos/login/wizard_controller.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/wizard_controller.h
diff --git a/chrome/browser/chromeos/login/wizard_controller.h b/chrome/browser/chromeos/login/wizard_controller.h
index 49fe73d3c7fa53e2b96eed62a1dcae1e768042e7..274a11de66984b20e0379dd73dcce64dbb1cb9c7 100644
--- a/chrome/browser/chromeos/login/wizard_controller.h
+++ b/chrome/browser/chromeos/login/wizard_controller.h
@@ -6,6 +6,7 @@
#define CHROME_BROWSER_CHROMEOS_LOGIN_WIZARD_CONTROLLER_H_
#include <map>
+#include <memory>
#include <string>
#include "base/compiler_specific.h"
@@ -13,7 +14,6 @@
#include "base/gtest_prod_util.h"
#include "base/macros.h"
#include "base/memory/linked_ptr.h"
-#include "base/memory/scoped_ptr.h"
#include "base/memory/weak_ptr.h"
#include "base/observer_list.h"
#include "base/time/time.h"
@@ -298,7 +298,7 @@ class WizardController : public BaseScreenDelegate,
TimeZoneProvider* GetTimezoneProvider();
// TimeZoneRequest::TimeZoneResponseCallback implementation.
- void OnTimezoneResolved(scoped_ptr<TimeZoneResponseData> timezone,
+ void OnTimezoneResolved(std::unique_ptr<TimeZoneResponseData> timezone,
bool server_error);
// Called from SimpleGeolocationProvider when location is resolved.
@@ -321,8 +321,8 @@ class WizardController : public BaseScreenDelegate,
// Called when a connection to controller has been established. Wizard
// controller takes the ownership of |pairing_controller| after that call.
- void OnSharkConnected(
- scoped_ptr<pairing_chromeos::HostPairingController> pairing_controller);
+ void OnSharkConnected(std::unique_ptr<pairing_chromeos::HostPairingController>
+ pairing_controller);
// Callback function for AddNetworkRequested().
void OnSetHostNetworkFailed();
@@ -410,16 +410,17 @@ class WizardController : public BaseScreenDelegate,
friend class WizardInProcessBrowserTest;
friend class WizardControllerBrokenLocalStateTest;
- scoped_ptr<AccessibilityStatusSubscription> accessibility_subscription_;
+ std::unique_ptr<AccessibilityStatusSubscription> accessibility_subscription_;
- scoped_ptr<SimpleGeolocationProvider> geolocation_provider_;
- scoped_ptr<TimeZoneProvider> timezone_provider_;
+ std::unique_ptr<SimpleGeolocationProvider> geolocation_provider_;
+ std::unique_ptr<TimeZoneProvider> timezone_provider_;
// Pairing controller for shark devices.
- scoped_ptr<pairing_chromeos::ControllerPairingController> shark_controller_;
+ std::unique_ptr<pairing_chromeos::ControllerPairingController>
+ shark_controller_;
// Pairing controller for remora devices.
- scoped_ptr<pairing_chromeos::HostPairingController> remora_controller_;
+ std::unique_ptr<pairing_chromeos::HostPairingController> remora_controller_;
// Maps screen ids to last time of their shows.
base::hash_map<std::string, base::Time> screen_show_times_;
@@ -431,7 +432,7 @@ class WizardController : public BaseScreenDelegate,
// Listens for incoming connection from a shark controller if a regular (not
// pairing) remora OOBE is active. If connection is established, wizard
// conroller swithces to a pairing OOBE.
- scoped_ptr<pairing_chromeos::SharkConnectionListener>
+ std::unique_ptr<pairing_chromeos::SharkConnectionListener>
shark_connection_listener_;
BaseScreen* hid_screen_ = nullptr;

Powered by Google App Engine
This is Rietveld 408576698