summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorcsilv@chromium.org <csilv@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-04-15 19:19:54 +0000
committercsilv@chromium.org <csilv@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-04-15 19:19:54 +0000
commit2d96d93e57bc81d9310e8f6058218bc578e5feff (patch)
treeda11584dd0d20e4aadba0e14477eb050f6c971d8
parenta1c8da540ef5847f2df8c720d313e550b04691e7 (diff)
downloadchromium_src-2d96d93e57bc81d9310e8f6058218bc578e5feff.zip
chromium_src-2d96d93e57bc81d9310e8f6058218bc578e5feff.tar.gz
chromium_src-2d96d93e57bc81d9310e8f6058218bc578e5feff.tar.bz2
Merge 79111 - A follow-up change for r76621. This change just adds 'if (cr.isChromeOS)' to
the JS code that depends on the 'language-options-ui-restart-button' button to prevent raising JS exceptions on Windows. (It seems r76621 <http://crrev.com/76621> removed the button on Windows without changing the JS code that depends on it.) R=csilv@chromium.org BUG=none TBR=hbono@chromium.org Review URL: http://codereview.chromium.org/6865025 git-svn-id: svn://svn.chromium.org/chrome/branches/696/src@81783 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/resources/options/language_options.js6
1 files changed, 4 insertions, 2 deletions
diff --git a/chrome/browser/resources/options/language_options.js b/chrome/browser/resources/options/language_options.js
index 07dfb7f..e2e6e75 100644
--- a/chrome/browser/resources/options/language_options.js
+++ b/chrome/browser/resources/options/language_options.js
@@ -337,8 +337,10 @@ cr.define('options', function() {
uiLanguageButton.onclick = function(e) {
chrome.send('uiLanguageChange', [languageCode]);
}
- $('language-options-ui-restart-button').onclick = function(e) {
- chrome.send('uiLanguageRestart');
+ if (cr.isChromeOS) {
+ $('language-options-ui-restart-button').onclick = function(e) {
+ chrome.send('uiLanguageRestart');
+ }
}
} else {
// If the language is not supported as UI language, the button