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

Unified Diff: chrome/browser/ui/webui/settings/reset_settings_handler.cc

Issue 2664753002: Remove base::StringValue (Closed)
Patch Set: Rebase Created 3 years, 9 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 372af034dd9937c6cb1b627f1d7edd252846b3c5..ca62979a8ba85b90ce9702d962a614562c318513 100644
--- a/chrome/browser/ui/webui/settings/reset_settings_handler.cc
+++ b/chrome/browser/ui/webui/settings/reset_settings_handler.cc
@@ -157,8 +157,8 @@ void ResetSettingsHandler::OnResetProfileSettingsDone(
std::string callback_id,
bool send_feedback,
reset_report::ChromeResetReport::ResetRequestOrigin request_origin) {
- ResolveJavascriptCallback(
- base::StringValue(callback_id), *base::Value::CreateNullValue());
+ ResolveJavascriptCallback(base::Value(callback_id),
+ *base::Value::CreateNullValue());
if (send_feedback && setting_snapshot_) {
ResettableSettingsSnapshot current_snapshot(profile_);
int difference = setting_snapshot_->FindDifferentFields(current_snapshot);
@@ -192,7 +192,7 @@ void ResetSettingsHandler::HandleGetReportedSettings(
void ResetSettingsHandler::OnGetReportedSettingsDone(std::string callback_id) {
std::unique_ptr<base::ListValue> list =
GetReadableFeedbackForSnapshot(profile_, *setting_snapshot_);
- ResolveJavascriptCallback(base::StringValue(callback_id), *list);
+ ResolveJavascriptCallback(base::Value(callback_id), *list);
}
void ResetSettingsHandler::OnShowResetProfileDialog(
@@ -294,7 +294,7 @@ void ResetSettingsHandler::HandleGetTriggeredResetToolName(
IDS_TRIGGERED_RESET_PROFILE_SETTINGS_DEFAULT_TOOL_NAME);
}
- base::StringValue string_value(reset_tool_name);
+ base::Value string_value(reset_tool_name);
ResolveJavascriptCallback(*callback_id, string_value);
}

Powered by Google App Engine
This is Rietveld 408576698