Commit cf516a30 authored by dbeam's avatar dbeam Committed by Commit bot

help: remove hash+ref+position from chrome://help page.

R=michaelpg@chromium.org
BUG=416133

Review URL: https://codereview.chromium.org/583193007

Cr-Commit-Position: refs/heads/master@{#295834}
parent 725e8d6e
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
</if> </if>
</div> </div>
<div id="version-container"> <div id="version-container">
<div i18n-values=".innerHTML:browserVersionLongHtml" dir="ltr"></div> <div i18n-content="browserVersion" dir="ltr"></div>
<if expr="chromeos"> <if expr="chromeos">
<div> <div>
<span i18n-content="platform"></span>&nbsp;<span id="os-version"></span> <span i18n-content="platform"></span>&nbsp;<span id="os-version"></span>
......
...@@ -112,26 +112,6 @@ bool CanChangeChannel() { ...@@ -112,26 +112,6 @@ bool CanChangeChannel() {
#endif // defined(OS_CHROMEOS) #endif // defined(OS_CHROMEOS)
base::string16 BrowserVersionString(bool long_html) {
chrome::VersionInfo version_info;
DCHECK(version_info.is_valid());
std::string version = version_info.Version();
std::string modifier = chrome::VersionInfo::GetVersionStringModifier();
if (!modifier.empty())
version += " " + modifier;
#if defined(ARCH_CPU_64_BITS)
version += " (64-bit)";
#endif
if (long_html)
version += "<br>(" + version_info.LastChange() + ")";
return base::UTF8ToUTF16(version);
}
} // namespace } // namespace
HelpHandler::HelpHandler() HelpHandler::HelpHandler()
...@@ -234,11 +214,7 @@ void HelpHandler::GetLocalizedValues(base::DictionaryValue* localized_strings) { ...@@ -234,11 +214,7 @@ void HelpHandler::GetLocalizedValues(base::DictionaryValue* localized_strings) {
localized_strings->SetString( localized_strings->SetString(
"browserVersion", "browserVersion",
l10n_util::GetStringFUTF16(IDS_ABOUT_PRODUCT_VERSION, l10n_util::GetStringFUTF16(IDS_ABOUT_PRODUCT_VERSION,
BrowserVersionString(false))); BuildBrowserVersionString()));
localized_strings->SetString(
"browserVersionLongHtml",
l10n_util::GetStringFUTF16(IDS_ABOUT_PRODUCT_VERSION,
BrowserVersionString(true)));
base::Time::Exploded exploded_time; base::Time::Exploded exploded_time;
base::Time::Now().LocalExplode(&exploded_time); base::Time::Now().LocalExplode(&exploded_time);
...@@ -335,7 +311,20 @@ void HelpHandler::Observe(int type, const content::NotificationSource& source, ...@@ -335,7 +311,20 @@ void HelpHandler::Observe(int type, const content::NotificationSource& source,
// static // static
base::string16 HelpHandler::BuildBrowserVersionString() { base::string16 HelpHandler::BuildBrowserVersionString() {
return BrowserVersionString(false); chrome::VersionInfo version_info;
DCHECK(version_info.is_valid());
std::string version = version_info.Version();
std::string modifier = chrome::VersionInfo::GetVersionStringModifier();
if (!modifier.empty())
version += " " + modifier;
#if defined(ARCH_CPU_64_BITS)
version += " (64-bit)";
#endif
return base::UTF8ToUTF16(version);
} }
void HelpHandler::OnPageLoaded(const base::ListValue* args) { void HelpHandler::OnPageLoaded(const base::ListValue* args) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment