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

Side by Side Diff: chrome/browser/resources/options/browser_options.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: rebase 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 cr.define('options', function() { 5 cr.define('options', function() {
6 var OptionsPage = options.OptionsPage; 6 var OptionsPage = options.OptionsPage;
7 var Page = cr.ui.pageManager.Page; 7 var Page = cr.ui.pageManager.Page;
8 var PageManager = cr.ui.pageManager.PageManager; 8 var PageManager = cr.ui.pageManager.PageManager;
9 var ArrayDataModel = cr.ui.ArrayDataModel; 9 var ArrayDataModel = cr.ui.ArrayDataModel;
10 var RepeatingButton = cr.ui.RepeatingButton; 10 var RepeatingButton = cr.ui.RepeatingButton;
(...skipping 112 matching lines...) Expand 10 before | Expand all | Expand 10 after
123 } 123 }
124 }; 124 };
125 } else { 125 } else {
126 $('advanced-settings-expander').hidden = true; 126 $('advanced-settings-expander').hidden = true;
127 $('advanced-settings').hidden = true; 127 $('advanced-settings').hidden = true;
128 } 128 }
129 129
130 $('advanced-settings').addEventListener('webkitTransitionEnd', 130 $('advanced-settings').addEventListener('webkitTransitionEnd',
131 this.updateAdvancedSettingsExpander_.bind(this)); 131 this.updateAdvancedSettingsExpander_.bind(this));
132 132
133 if (cr.isChromeOS && loadTimeData.getBoolean('showVersion')) {
134 $('version-button').hidden = false;
135 $('version-button').addEventListener('click', function() {
136 PageManager.showPageByName('help');
137 chrome.send('coreOptionsUserMetricsAction',
138 ['Options_About']);
139 });
140 }
141
133 if (cr.isChromeOS) { 142 if (cr.isChromeOS) {
134 UIAccountTweaks.applyGuestSessionVisibility(document); 143 UIAccountTweaks.applyGuestSessionVisibility(document);
135 UIAccountTweaks.applyPublicSessionVisibility(document); 144 UIAccountTweaks.applyPublicSessionVisibility(document);
136 if (loadTimeData.getBoolean('secondaryUser')) 145 if (loadTimeData.getBoolean('secondaryUser'))
137 $('secondary-user-banner').hidden = false; 146 $('secondary-user-banner').hidden = false;
138 } 147 }
139 148
140 // Sync (Sign in) section. 149 // Sync (Sign in) section.
141 this.updateSyncState_(loadTimeData.getValue('syncData')); 150 this.updateSyncState_(loadTimeData.getValue('syncData'));
142 151
(...skipping 1813 matching lines...) Expand 10 before | Expand all | Expand 10 after
1956 BrowserOptions.getLoggedInUsername = function() { 1965 BrowserOptions.getLoggedInUsername = function() {
1957 return BrowserOptions.getInstance().username_; 1966 return BrowserOptions.getInstance().username_;
1958 }; 1967 };
1959 } 1968 }
1960 1969
1961 // Export 1970 // Export
1962 return { 1971 return {
1963 BrowserOptions: BrowserOptions 1972 BrowserOptions: BrowserOptions
1964 }; 1973 };
1965 }); 1974 });
OLDNEW
« no previous file with comments | « chrome/browser/resources/options/browser_options.html ('k') | chrome/browser/resources/options/options.html » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698