Skip to content

GitLab

T
tangled
Commit dbffc7a7 authored by michaelpg@chromium.org's avatar michaelpg@chromium.org
Browse files
Options

Change Help page title to About. 

The Help page (chrome://help) should be called "About". This changes
the page title and header, and the link in the uber frame sidebar.

BUG=381794
R=dbeam@chromium.org
TBR=sky@chromium.org

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@275643 0039d316-1c4b-4281-b951-d872f2087c98
parent 9f5fc7bb
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 11 deletions
chrome/app/generated_resources.grd
View file @ dbffc7a7
...@@ -9467,9 +9467,6 @@ Chrome ran out of memory. ...@@ -9467,9 +9467,6 @@ Chrome ran out of memory.
<!-- chrome://help --> <!-- chrome://help -->
<if expr="not is_android"> <if expr="not is_android">
<message name="IDS_HELP_TITLE" desc="Label used for title of the help page.">
Help
</message>
<if expr="chromeos"> <if expr="chromeos">
<message name="IDS_SHOW_MORE_INFO" desc="The label of the 'More info' link."> <message name="IDS_SHOW_MORE_INFO" desc="The label of the 'More info' link.">
More info... More info...
...@@ -9479,8 +9476,7 @@ Chrome ran out of memory. ...@@ -9479,8 +9476,7 @@ Chrome ran out of memory.
</message> </message>
</if> </if>
<!-- The About page is now part of options. --> <message name="IDS_ABOUT_TITLE" desc="Label used for title of the About page, chrome://help.">
<message name="IDS_ABOUT_TAB_TITLE" desc="Label used for tab of about page.">
About About
</message> </message>
<if expr="not chromeos and use_titlecase"> <if expr="not chromeos and use_titlecase">
......
chrome/browser/resources/help/help.html
View file @ dbffc7a7
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<html i18n-values="dir:textdirection;"> <html i18n-values="dir:textdirection;">
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
<title i18n-content="helpTitle"></title> <title i18n-content="aboutTitle"></title>
<link rel="stylesheet" href="chrome://resources/css/chrome_shared.css"> <link rel="stylesheet" href="chrome://resources/css/chrome_shared.css">
<link rel="stylesheet" href="../uber/uber_shared.css"> <link rel="stylesheet" href="../uber/uber_shared.css">
<link rel="stylesheet" href="help.css"> <link rel="stylesheet" href="help.css">
......
chrome/browser/resources/help/help.js
View file @ dbffc7a7
...@@ -56,7 +56,7 @@ cr.define('help', function() { ...@@ -56,7 +56,7 @@ cr.define('help', function() {
uber.onContentFrameLoaded(); uber.onContentFrameLoaded();
// Set the title. // Set the title.
uber.setTitle(loadTimeData.getString('helpTitle')); uber.setTitle(loadTimeData.getString('aboutTitle'));
$('product-license').innerHTML = loadTimeData.getString('productLicense'); $('product-license').innerHTML = loadTimeData.getString('productLicense');
if (cr.isChromeOS) { if (cr.isChromeOS) {
......
chrome/browser/ui/toolbar/origin_chip_info.cc
View file @ dbffc7a7
...@@ -59,7 +59,7 @@ int StringForChromeHost(const GURL& url) { ...@@ -59,7 +59,7 @@ int StringForChromeHost(const GURL& url) {
if (host == chrome::kChromeUIExtensionsHost) if (host == chrome::kChromeUIExtensionsHost)
return IDS_MANAGE_EXTENSIONS_SETTING_WINDOWS_TITLE; return IDS_MANAGE_EXTENSIONS_SETTING_WINDOWS_TITLE;
if (host == chrome::kChromeUIHelpHost) if (host == chrome::kChromeUIHelpHost)
return IDS_ABOUT_TAB_TITLE; return IDS_ABOUT_TITLE;
if (host == chrome::kChromeUIHistoryHost) if (host == chrome::kChromeUIHistoryHost)
return IDS_HISTORY_TITLE; return IDS_HISTORY_TITLE;
if (host == chrome::kChromeUINewTabHost) if (host == chrome::kChromeUINewTabHost)
......
chrome/browser/ui/webui/help/help_handler.cc
View file @ dbffc7a7
...@@ -149,8 +149,7 @@ void HelpHandler::GetLocalizedValues(content::WebUIDataSource* source) { ...@@ -149,8 +149,7 @@ void HelpHandler::GetLocalizedValues(content::WebUIDataSource* source) {
}; };
static L10nResources resources[] = { static L10nResources resources[] = {
{ "helpTitle", IDS_HELP_TITLE }, { "aboutTitle", IDS_ABOUT_TITLE },
{ "aboutTitle", IDS_ABOUT_TAB_TITLE },
#if defined(OS_CHROMEOS) #if defined(OS_CHROMEOS)
{ "aboutProductTitle", IDS_PRODUCT_OS_NAME }, { "aboutProductTitle", IDS_PRODUCT_OS_NAME },
#else #else
......
chrome/browser/ui/webui/uber/uber_ui.cc
View file @ dbffc7a7
...@@ -108,7 +108,7 @@ content::WebUIDataSource* CreateUberFrameHTMLSource(Profile* profile) { ...@@ -108,7 +108,7 @@ content::WebUIDataSource* CreateUberFrameHTMLSource(Profile* profile) {
IDS_MANAGE_EXTENSIONS_SETTING_WINDOWS_TITLE); IDS_MANAGE_EXTENSIONS_SETTING_WINDOWS_TITLE);
source->AddString("helpHost", source->AddString("helpHost",
ASCIIToUTF16(chrome::kChromeUIHelpHost)); ASCIIToUTF16(chrome::kChromeUIHelpHost));
source->AddLocalizedString("helpDisplayName", IDS_HELP_TITLE); source->AddLocalizedString("helpDisplayName", IDS_ABOUT_TITLE);
source->AddString("historyHost", source->AddString("historyHost",
ASCIIToUTF16(chrome::kChromeUIHistoryHost)); ASCIIToUTF16(chrome::kChromeUIHistoryHost));
source->AddLocalizedString("historyDisplayName", IDS_HISTORY_TITLE); source->AddLocalizedString("historyDisplayName", IDS_HISTORY_TITLE);
......
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