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

Side by Side Diff: chrome/browser/resources/options/browser_options.js

Issue 1126933004: Allow switching between extended and unified (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 7 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
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.exportPath('options'); 5 cr.exportPath('options');
6 6
7 /** 7 /**
8 * @typedef {{actionLinkText: (string|undefined), 8 * @typedef {{actionLinkText: (string|undefined),
9 * childUser: (boolean|undefined), 9 * childUser: (boolean|undefined),
10 * hasError: (boolean|undefined), 10 * hasError: (boolean|undefined),
(...skipping 1681 matching lines...) Expand 10 before | Expand all | Expand 10 after
1692 * @private 1692 * @private
1693 */ 1693 */
1694 enableCertificateButton_: function(enabled) { 1694 enableCertificateButton_: function(enabled) {
1695 $('certificatesManageButton').disabled = !enabled; 1695 $('certificatesManageButton').disabled = !enabled;
1696 }, 1696 },
1697 1697
1698 /** 1698 /**
1699 * Enables or disables the Chrome OS display settings button and overlay. 1699 * Enables or disables the Chrome OS display settings button and overlay.
1700 * @private 1700 * @private
1701 */ 1701 */
1702 enableDisplaySettings_: function(enabled) { 1702 enableDisplaySettings_: function(enabled, showUnifiedDesktop) {
1703 if (cr.isChromeOS) { 1703 if (cr.isChromeOS) {
1704 $('display-options').disabled = !enabled; 1704 $('display-options').disabled = !enabled;
1705 DisplayOptions.getInstance().setEnabled(enabled); 1705 DisplayOptions.getInstance().setEnabled(enabled, showUnifiedDesktop);
1706 } 1706 }
1707 }, 1707 },
1708 1708
1709 /** 1709 /**
1710 * Enables factory reset section. 1710 * Enables factory reset section.
1711 * @private 1711 * @private
1712 */ 1712 */
1713 enableFactoryResetSection_: function() { 1713 enableFactoryResetSection_: function() {
1714 $('factory-reset-section').hidden = false; 1714 $('factory-reset-section').hidden = false;
1715 }, 1715 },
(...skipping 553 matching lines...) Expand 10 before | Expand all | Expand 10 after
2269 } 2269 }
2270 button.textContent = loadTimeData.getString(strId); 2270 button.textContent = loadTimeData.getString(strId);
2271 }; 2271 };
2272 } 2272 }
2273 2273
2274 // Export 2274 // Export
2275 return { 2275 return {
2276 BrowserOptions: BrowserOptions 2276 BrowserOptions: BrowserOptions
2277 }; 2277 };
2278 }); 2278 });
OLDNEW
« no previous file with comments | « ash/system/chromeos/tray_display.cc ('k') | chrome/browser/resources/options/chromeos/display_options.html » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698