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

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: About in Settings 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 105 matching lines...) Expand 10 before | Expand all | Expand 10 after
116 } 116 }
117 }; 117 };
118 } else { 118 } else {
119 $('advanced-settings-expander').hidden = true; 119 $('advanced-settings-expander').hidden = true;
120 $('advanced-settings').hidden = true; 120 $('advanced-settings').hidden = true;
121 } 121 }
122 122
123 $('advanced-settings').addEventListener('webkitTransitionEnd', 123 $('advanced-settings').addEventListener('webkitTransitionEnd',
124 this.updateAdvancedSettingsExpander_.bind(this)); 124 this.updateAdvancedSettingsExpander_.bind(this));
125 125
126 if (cr.isChromeOS && loadTimeData.getBoolean('showVersion')) {
127 $('version-button').hidden = false;
128 $('version-button').addEventListener('click', function() {
129 PageManager.showPageByName('help');
130 chrome.send('coreOptionsUserMetricsAction',
131 ['Options_About']);
132 });
133 }
134
126 if (cr.isChromeOS) { 135 if (cr.isChromeOS) {
127 UIAccountTweaks.applyGuestSessionVisibility(document); 136 UIAccountTweaks.applyGuestSessionVisibility(document);
128 UIAccountTweaks.applyPublicSessionVisibility(document); 137 UIAccountTweaks.applyPublicSessionVisibility(document);
129 if (loadTimeData.getBoolean('secondaryUser')) 138 if (loadTimeData.getBoolean('secondaryUser'))
130 $('secondary-user-banner').hidden = false; 139 $('secondary-user-banner').hidden = false;
131 } 140 }
132 141
133 // Sync (Sign in) section. 142 // Sync (Sign in) section.
134 this.updateSyncState_(loadTimeData.getValue('syncData')); 143 this.updateSyncState_(loadTimeData.getValue('syncData'));
135 144
(...skipping 1779 matching lines...) Expand 10 before | Expand all | Expand 10 after
1915 BrowserOptions.getLoggedInUsername = function() { 1924 BrowserOptions.getLoggedInUsername = function() {
1916 return BrowserOptions.getInstance().username_; 1925 return BrowserOptions.getInstance().username_;
1917 }; 1926 };
1918 } 1927 }
1919 1928
1920 // Export 1929 // Export
1921 return { 1930 return {
1922 BrowserOptions: BrowserOptions 1931 BrowserOptions: BrowserOptions
1923 }; 1932 };
1924 }); 1933 });
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698