diff options
author | kochi@chromium.org <kochi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-21 09:10:11 +0000 |
---|---|---|
committer | kochi@chromium.org <kochi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-21 09:10:11 +0000 |
commit | 15ba3e1a737fb2c8260779424fcd94f79e9a42e3 (patch) | |
tree | fb21e9324d81846236f081a4f38f5a89ad272fdd | |
parent | 37177e0e2e5a6fa7b67976f757279adf6c36f5ca (diff) | |
download | chromium_src-15ba3e1a737fb2c8260779424fcd94f79e9a42e3.zip chromium_src-15ba3e1a737fb2c8260779424fcd94f79e9a42e3.tar.gz chromium_src-15ba3e1a737fb2c8260779424fcd94f79e9a42e3.tar.bz2 |
Fix the regression caused by r72061.
The CL ifdef'ed out for some parts of HTML, but it did not touch the corresponding JS code that modifies the part.
BUG=chromium-os:11142
TEST=manually open chrome://settings
Review URL: http://codereview.chromium.org/6342013
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@72114 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r-- | chrome/browser/resources/options/advanced_options.js | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/chrome/browser/resources/options/advanced_options.js b/chrome/browser/resources/options/advanced_options.js index 3291fa6..0c8697c 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. |