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

Unified Diff: chrome/browser/resources/help/help_page.js

Issue 449623003: Integrate About page into Settings for Chrome OS settings in a window. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix tests Created 6 years, 4 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/resources/help/help_page.js
diff --git a/chrome/browser/resources/help/help_page.js b/chrome/browser/resources/help/help_page.js
index 10a1807a93a813abd2386e450a635a8c2ad52c0b..6da2149d4385822fa5925c7dcba46ce12ee73105 100644
--- a/chrome/browser/resources/help/help_page.js
+++ b/chrome/browser/resources/help/help_page.js
@@ -11,8 +11,12 @@ cr.define('help', function() {
* confusion with generic AboutUI (about:memory, about:sandbox, etc.).
*/
function HelpPage() {
- Page.call(this, 'help', loadTimeData.getString('aboutTitle'),
- 'help-page');
+ var title;
+ if (loadTimeData.valueExists('aboutOverlayTabTitle'))
+ title = loadTimeData.getString('aboutOverlayTabTitle');
+ else
+ title = loadTimeData.getString('aboutTitle');
Dan Beam 2014/08/13 02:50:46 nit: var id = loadTimeData.valueExists('aboutOv
michaelpg 2014/08/13 08:12:11 Done.
+ Page.call(this, 'help', title, 'help-page');
}
cr.addSingletonGetter(HelpPage);
@@ -114,7 +118,7 @@ cr.define('help', function() {
}
$('change-channel').onclick = function() {
- PageManager.showPageByName('channel-change-page', false);
Dan Beam 2014/08/13 02:50:46 i'd do this separately
Dan Beam 2014/08/13 17:03:18 ping
michaelpg 2014/08/13 20:17:50 Done.
+ PageManager.showPageByName('channel-change-page');
};
var channelChangeDisallowedError = document.createElement('div');
@@ -143,6 +147,12 @@ cr.define('help', function() {
chrome.send('onPageLoaded');
},
+ /** @override */
+ didClosePage: function() {
+ if ($('more-info-container').classList.contains('visible'))
+ this.toggleMoreInfo_();
+ },
+
/**
* Toggles the visible state of the 'More Info' section.
* @private

Powered by Google App Engine
This is Rietveld 408576698