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

Unified Diff: chrome/browser/ui/webui/settings/reset_settings_handler.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/webui/settings/reset_settings_handler.cc
diff --git a/chrome/browser/ui/webui/settings/reset_settings_handler.cc b/chrome/browser/ui/webui/settings/reset_settings_handler.cc
index f9e405bd1c5545cc85b7f472b0cc7f9edf401fe7..19847c3e0588b8b4cadc25f569aad0240bbb4b2b 100644
--- a/chrome/browser/ui/webui/settings/reset_settings_handler.cc
+++ b/chrome/browser/ui/webui/settings/reset_settings_handler.cc
@@ -139,7 +139,7 @@ void ResetSettingsHandler::OnResetProfileSettingsDone(
int difference = setting_snapshot_->FindDifferentFields(current_snapshot);
if (difference) {
setting_snapshot_->Subtract(current_snapshot);
- scoped_ptr<reset_report::ChromeResetReport> report_proto =
+ std::unique_ptr<reset_report::ChromeResetReport> report_proto =
SerializeSettingsReportToProto(*setting_snapshot_, difference);
if (report_proto)
SendSettingsFeedbackProto(*report_proto, profile_);
@@ -188,7 +188,7 @@ void ResetSettingsHandler::ResetProfile(std::string callback_id,
bool send_settings) {
DCHECK(!GetResetter()->IsActive());
- scoped_ptr<BrandcodedDefaultSettings> default_settings;
+ std::unique_ptr<BrandcodedDefaultSettings> default_settings;
if (config_fetcher_) {
DCHECK(!config_fetcher_->IsActive());
default_settings = config_fetcher_->GetSettings();
@@ -215,8 +215,8 @@ void ResetSettingsHandler::ResetProfile(std::string callback_id,
void ResetSettingsHandler::UpdateFeedbackUI() {
if (!setting_snapshot_)
return;
- scoped_ptr<base::ListValue> list = GetReadableFeedbackForSnapshot(
- profile_, *setting_snapshot_);
+ std::unique_ptr<base::ListValue> list =
+ GetReadableFeedbackForSnapshot(profile_, *setting_snapshot_);
web_ui()->CallJavascriptFunction("cr.webUIListenerCallback",
base::StringValue("feedback-info-changed"),
*list.release());

Powered by Google App Engine
This is Rietveld 408576698