summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
authorsatorux@chromium.org <satorux@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-07 05:59:16 +0000
committersatorux@chromium.org <satorux@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-07 05:59:16 +0000
commit9122371946844e2bf15a1d8957584b622840d171 (patch)
treea0efff2a17d50c02b242d7e520e96282a62256e2 /chrome
parentf27e81c63be89c62d84105a9329c0744c27e1641 (diff)
downloadchromium_src-9122371946844e2bf15a1d8957584b622840d171.zip
chromium_src-9122371946844e2bf15a1d8957584b622840d171.tar.gz
chromium_src-9122371946844e2bf15a1d8957584b622840d171.tar.bz2
Fix a JavaScript error in personal_options.js for Chrome OS.
Element 'themes_set_classic' is not present for Chrome OS, but only for linux and bsd, per personal_options.html <if expr="not pp_ifdef('toolkit_views') and (os == 'linux2' or os.find('bsd') != -1)"> ... <button id="themes_set_classic" i18n-content="themes_set_classic"></button> TEST=opened chrome:settings and confirmed that the error was gone. BUG=chromium-os:7387 Review URL: http://codereview.chromium.org/3526021 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@61766 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
-rw-r--r--chrome/browser/resources/options/personal_options.js5
1 files changed, 3 insertions, 2 deletions
diff --git a/chrome/browser/resources/options/personal_options.js b/chrome/browser/resources/options/personal_options.js
index 357f5af..3c4d196 100644
--- a/chrome/browser/resources/options/personal_options.js
+++ b/chrome/browser/resources/options/personal_options.js
@@ -111,7 +111,9 @@ cr.define('options', function() {
},
setClassicThemeButtonEnabled_: function(enabled) {
- $('themes_set_classic').disabled = !enabled;
+ if (!cr.isChromeOS && navigator.platform.match(/linux|BSD/i)) {
+ $('themes_set_classic').disabled = !enabled;
+ }
},
updateControl_: function(control, visible) {
@@ -162,4 +164,3 @@ cr.define('options', function() {
};
});
-