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

Unified Diff: content/browser/tracing/tracing_ui.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
« no previous file with comments | « content/browser/tracing/etw_tracing_agent_win.cc ('k') | content/child/v8_value_converter_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/tracing/tracing_ui.cc
diff --git a/content/browser/tracing/tracing_ui.cc b/content/browser/tracing/tracing_ui.cc
index ca612ba23aff8b9561e2a8e2327d4d76674b1140..56a4c052a5a0633d6692705f2e15ae4c16f34b74 100644
--- a/content/browser/tracing/tracing_ui.cc
+++ b/content/browser/tracing/tracing_ui.cc
@@ -247,7 +247,7 @@ void TracingUI::DoUploadBase64Encoded(const base::ListValue* args) {
std::string file_contents_base64;
if (!args || args->empty() || !args->GetString(0, &file_contents_base64)) {
web_ui()->CallJavascriptFunctionUnsafe("onUploadError",
- base::StringValue("Missing data"));
+ base::Value("Missing data"));
return;
}
@@ -263,7 +263,7 @@ void TracingUI::DoUpload(const base::ListValue* args) {
std::string file_contents;
if (!args || args->empty() || !args->GetString(0, &file_contents)) {
web_ui()->CallJavascriptFunctionUnsafe("onUploadError",
- base::StringValue("Missing data"));
+ base::Value("Missing data"));
return;
}
@@ -273,14 +273,14 @@ void TracingUI::DoUpload(const base::ListValue* args) {
void TracingUI::DoUploadInternal(const std::string& file_contents,
TraceUploader::UploadMode upload_mode) {
if (!delegate_) {
- web_ui()->CallJavascriptFunctionUnsafe(
- "onUploadError", base::StringValue("Not implemented"));
+ web_ui()->CallJavascriptFunctionUnsafe("onUploadError",
+ base::Value("Not implemented"));
return;
}
if (trace_uploader_) {
- web_ui()->CallJavascriptFunctionUnsafe(
- "onUploadError", base::StringValue("Upload in progress"));
+ web_ui()->CallJavascriptFunctionUnsafe("onUploadError",
+ base::Value("Upload in progress"));
return;
}
@@ -306,18 +306,18 @@ void TracingUI::OnTraceUploadProgress(int64_t current, int64_t total) {
int percent = (current / total) * 100;
web_ui()->CallJavascriptFunctionUnsafe(
"onUploadProgress", base::Value(percent),
- base::StringValue(base::StringPrintf("%" PRId64, current)),
- base::StringValue(base::StringPrintf("%" PRId64, total)));
+ base::Value(base::StringPrintf("%" PRId64, current)),
+ base::Value(base::StringPrintf("%" PRId64, total)));
}
void TracingUI::OnTraceUploadComplete(bool success,
const std::string& feedback) {
if (success) {
web_ui()->CallJavascriptFunctionUnsafe("onUploadComplete",
- base::StringValue(feedback));
+ base::Value(feedback));
} else {
web_ui()->CallJavascriptFunctionUnsafe("onUploadError",
- base::StringValue(feedback));
+ base::Value(feedback));
}
trace_uploader_.reset();
}
« no previous file with comments | « content/browser/tracing/etw_tracing_agent_win.cc ('k') | content/child/v8_value_converter_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698