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

Unified Diff: chrome/browser/resources/options/advanced_options.js

Issue 6342013: Fix the regression caused by r72061. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/chrome/browser/resources/options
Patch Set: Fix unexpected tabs. Created 9 years, 11 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 | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/resources/options/advanced_options.js
diff --git a/chrome/browser/resources/options/advanced_options.js b/chrome/browser/resources/options/advanced_options.js
index 3291fa6844bc510b96723bf3608e8f5a982fb036..0c8697cc18c65cd2cf2bcf2af5c82ed2821868d2 100644
--- a/chrome/browser/resources/options/advanced_options.js
+++ b/chrome/browser/resources/options/advanced_options.js
@@ -49,9 +49,12 @@ var OptionsPage = options.OptionsPage;
};
}
- $('autoOpenFileTypesResetToDefault').onclick = function(event) {
- chrome.send('autoOpenFileTypesAction');
- };
+ if (!cr.isChromeOS) {
+ $('autoOpenFileTypesResetToDefault').onclick = function(event) {
+ chrome.send('autoOpenFileTypesAction');
+ };
+ }
+
$('fontSettingsCustomizeFontsButton').onclick = function(event) {
OptionsPage.showPageByName('fontSettings');
chrome.send('coreOptionsUserMetricsAction', ['Options_FontSettings']);
@@ -201,7 +204,8 @@ var OptionsPage = options.OptionsPage;
// Set the enabled state for the autoOpenFileTypesResetToDefault button.
AdvancedOptions.SetAutoOpenFileTypesDisabledAttribute = function(disabled) {
- $('autoOpenFileTypesResetToDefault').disabled = disabled;
+ if (!cr.isChromeOS)
+ $('autoOpenFileTypesResetToDefault').disabled = disabled;
};
// Set the enabled state for the proxy settings button.
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698