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

Unified Diff: chrome/browser/chromeos/login/wizard_controller.cc

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.cc
diff --git a/chrome/browser/chromeos/login/wizard_controller.cc b/chrome/browser/chromeos/login/wizard_controller.cc
index 6441b6452f1eed054c61d9b805b6461bd2a93a3c..a64dbf85c4a6e30eb7a9395be0348fed53648e38 100644
--- a/chrome/browser/chromeos/login/wizard_controller.cc
+++ b/chrome/browser/chromeos/login/wizard_controller.cc
@@ -324,12 +324,12 @@ BaseScreen* WizardController::GetScreen(const std::string& screen_name) {
BaseScreen* WizardController::CreateScreen(const std::string& screen_name) {
if (screen_name == kNetworkScreenName) {
- scoped_ptr<NetworkScreen> screen(
+ std::unique_ptr<NetworkScreen> screen(
new NetworkScreen(this, this, oobe_ui_->GetNetworkView()));
screen->Initialize(nullptr /* context */);
return screen.release();
} else if (screen_name == kUpdateScreenName) {
- scoped_ptr<UpdateScreen> screen(new UpdateScreen(
+ std::unique_ptr<UpdateScreen> screen(new UpdateScreen(
this, oobe_ui_->GetUpdateView(), remora_controller_.get()));
screen->Initialize(nullptr /* context */);
return screen.release();
@@ -358,7 +358,7 @@ BaseScreen* WizardController::CreateScreen(const std::string& screen_name) {
return new SupervisedUserCreationScreen(
this, oobe_ui_->GetSupervisedUserCreationScreenActor());
} else if (screen_name == kHIDDetectionScreenName) {
- scoped_ptr<HIDDetectionScreen> screen(new chromeos::HIDDetectionScreen(
+ std::unique_ptr<HIDDetectionScreen> screen(new chromeos::HIDDetectionScreen(
this, oobe_ui_->GetHIDDetectionView()));
screen->Initialize(nullptr /* context */);
return screen.release();
@@ -1237,7 +1237,7 @@ PrefService* WizardController::GetLocalState() {
}
void WizardController::OnTimezoneResolved(
- scoped_ptr<TimeZoneResponseData> timezone,
+ std::unique_ptr<TimeZoneResponseData> timezone,
bool server_error) {
DCHECK_CURRENTLY_ON(BrowserThread::UI);
DCHECK(timezone.get());
@@ -1342,7 +1342,8 @@ void WizardController::MaybeStartListeningForSharkConnection() {
}
void WizardController::OnSharkConnected(
- scoped_ptr<pairing_chromeos::HostPairingController> remora_controller) {
+ std::unique_ptr<pairing_chromeos::HostPairingController>
+ remora_controller) {
VLOG(1) << "OnSharkConnected";
remora_controller_ = std::move(remora_controller);
base::MessageLoop::current()->DeleteSoon(
« no previous file with comments | « chrome/browser/chromeos/login/wizard_controller.h ('k') | chrome/browser/chromeos/login/wizard_controller_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698