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

Unified 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 side-by-side diff with in-line comments
Download patch
« 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 »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/resources/options/browser_options.js
diff --git a/chrome/browser/resources/options/browser_options.js b/chrome/browser/resources/options/browser_options.js
index f104402ab7c857806ae443651393018252e48bff..d9456b7f888e7cc85725829b41027b58087107a0 100644
--- a/chrome/browser/resources/options/browser_options.js
+++ b/chrome/browser/resources/options/browser_options.js
@@ -1699,10 +1699,10 @@ cr.define('options', function() {
* Enables or disables the Chrome OS display settings button and overlay.
* @private
*/
- enableDisplaySettings_: function(enabled) {
+ enableDisplaySettings_: function(enabled, showUnifiedDesktop) {
if (cr.isChromeOS) {
$('display-options').disabled = !enabled;
- DisplayOptions.getInstance().setEnabled(enabled);
+ DisplayOptions.getInstance().setEnabled(enabled, showUnifiedDesktop);
}
},
« 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