Index: chrome/browser/ui/webui/help/help_handler.cc |
diff --git a/chrome/browser/ui/webui/help/help_handler.cc b/chrome/browser/ui/webui/help/help_handler.cc |
index de911086f592c8d05277a820417ae5708f4ffcf8..7b697b316449a77b0cab327de2368166c2ca4f00 100644 |
--- a/chrome/browser/ui/webui/help/help_handler.cc |
+++ b/chrome/browser/ui/webui/help/help_handler.cc |
@@ -483,7 +483,7 @@ void HelpHandler::OnPageLoaded(const base::ListValue* args) { |
base::Time build_time = base::SysInfo::GetLsbReleaseTime(); |
base::string16 build_date = base::TimeFormatFriendlyDate(build_time); |
web_ui()->CallJavascriptFunctionUnsafe("help.HelpPage.setBuildDate", |
- base::StringValue(build_date)); |
+ base::Value(build_date)); |
#endif // defined(OS_CHROMEOS) |
RefreshUpdateStatus(); |
@@ -637,8 +637,8 @@ void HelpHandler::SetUpdateStatus(VersionUpdater::Status status, |
} |
web_ui()->CallJavascriptFunctionUnsafe("help.HelpPage.setUpdateStatus", |
- base::StringValue(status_str), |
- base::StringValue(message)); |
+ base::Value(status_str), |
+ base::Value(message)); |
if (status == VersionUpdater::UPDATING) { |
web_ui()->CallJavascriptFunctionUnsafe("help.HelpPage.setProgress", |
@@ -652,7 +652,7 @@ void HelpHandler::SetUpdateStatus(VersionUpdater::Status status, |
if (!types_msg.empty()) { |
web_ui()->CallJavascriptFunctionUnsafe( |
"help.HelpPage.setAndShowAllowedConnectionTypesMsg", |
- base::StringValue(types_msg)); |
+ base::Value(types_msg)); |
} else { |
web_ui()->CallJavascriptFunctionUnsafe( |
"help.HelpPage.showAllowedConnectionTypesMsg", base::Value(false)); |
@@ -681,34 +681,34 @@ void HelpHandler::SetPromotionState(VersionUpdater::PromotionState state) { |
} |
web_ui()->CallJavascriptFunctionUnsafe("help.HelpPage.setPromotionState", |
- base::StringValue(state_str)); |
+ base::Value(state_str)); |
} |
#endif // defined(OS_MACOSX) |
#if defined(OS_CHROMEOS) |
void HelpHandler::OnOSVersion(const std::string& version) { |
web_ui()->CallJavascriptFunctionUnsafe("help.HelpPage.setOSVersion", |
- base::StringValue(version)); |
+ base::Value(version)); |
} |
void HelpHandler::OnARCVersion(const std::string& firmware) { |
web_ui()->CallJavascriptFunctionUnsafe("help.HelpPage.setARCVersion", |
- base::StringValue(firmware)); |
+ base::Value(firmware)); |
} |
void HelpHandler::OnOSFirmware(const std::string& firmware) { |
web_ui()->CallJavascriptFunctionUnsafe("help.HelpPage.setOSFirmware", |
- base::StringValue(firmware)); |
+ base::Value(firmware)); |
} |
void HelpHandler::OnCurrentChannel(const std::string& channel) { |
web_ui()->CallJavascriptFunctionUnsafe("help.HelpPage.updateCurrentChannel", |
- base::StringValue(channel)); |
+ base::Value(channel)); |
} |
void HelpHandler::OnTargetChannel(const std::string& channel) { |
web_ui()->CallJavascriptFunctionUnsafe("help.HelpPage.updateTargetChannel", |
- base::StringValue(channel)); |
+ base::Value(channel)); |
} |
void HelpHandler::OnRegulatoryLabelDirFound(const base::FilePath& path) { |
@@ -730,14 +730,14 @@ void HelpHandler::OnRegulatoryLabelImageFound(const base::FilePath& path) { |
std::string url = std::string("chrome://") + chrome::kChromeOSAssetHost + |
"/" + path.MaybeAsASCII(); |
web_ui()->CallJavascriptFunctionUnsafe("help.HelpPage.setRegulatoryLabelPath", |
- base::StringValue(url)); |
+ base::Value(url)); |
} |
void HelpHandler::OnRegulatoryLabelTextRead(const std::string& text) { |
// Remove unnecessary whitespace. |
web_ui()->CallJavascriptFunctionUnsafe( |
"help.HelpPage.setRegulatoryLabelText", |
- base::StringValue(base::CollapseWhitespaceASCII(text, true))); |
+ base::Value(base::CollapseWhitespaceASCII(text, true))); |
} |
void HelpHandler::OnEolStatus(update_engine::EndOfLifeStatus status) { |
@@ -748,13 +748,13 @@ void HelpHandler::OnEolStatus(update_engine::EndOfLifeStatus status) { |
} |
if (status == update_engine::EndOfLifeStatus::kSupported) { |
- web_ui()->CallJavascriptFunctionUnsafe( |
- "help.HelpPage.updateEolMessage", base::StringValue("device_supported"), |
- base::StringValue("")); |
+ web_ui()->CallJavascriptFunctionUnsafe("help.HelpPage.updateEolMessage", |
+ base::Value("device_supported"), |
+ base::Value("")); |
} else { |
web_ui()->CallJavascriptFunctionUnsafe( |
- "help.HelpPage.updateEolMessage", base::StringValue("device_endoflife"), |
- base::StringValue(l10n_util::GetStringUTF16(IDS_ABOUT_PAGE_EOL_EOL))); |
+ "help.HelpPage.updateEolMessage", base::Value("device_endoflife"), |
+ base::Value(l10n_util::GetStringUTF16(IDS_ABOUT_PAGE_EOL_EOL))); |
} |
} |