summaryrefslogtreecommitdiffstats
path: root/chrome/browser
diff options
context:
space:
mode:
authordhg@chromium.org <dhg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-07-07 15:20:57 +0000
committerdhg@chromium.org <dhg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-07-07 15:20:57 +0000
commit94b26710c1ffef6bcff61e9ff22cb58f434f7e37 (patch)
tree1ebbc00dcb4e2fc2deeb70d42c0ae4fca36f9eb8 /chrome/browser
parentfd652ed724fba8f306180cb6361e384ae5b3f058 (diff)
downloadchromium_src-94b26710c1ffef6bcff61e9ff22cb58f434f7e37.zip
chromium_src-94b26710c1ffef6bcff61e9ff22cb58f434f7e37.tar.gz
chromium_src-94b26710c1ffef6bcff61e9ff22cb58f434f7e37.tar.bz2
Fixing chromeos build of the options. They were asserting becuase of a lack of a setting.
BUG=none TEST=none. Review URL: http://codereview.chromium.org/2858048 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@51716 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser')
-rw-r--r--chrome/browser/resources/options/chromeos_system_options.html14
-rw-r--r--chrome/browser/resources/options/chromeos_system_options.js5
2 files changed, 3 insertions, 16 deletions
diff --git a/chrome/browser/resources/options/chromeos_system_options.html b/chrome/browser/resources/options/chromeos_system_options.html
index 3d19fba..84d5c20 100644
--- a/chrome/browser/resources/options/chromeos_system_options.html
+++ b/chrome/browser/resources/options/chromeos_system_options.html
@@ -1,19 +1,5 @@
<div class="page hidden" id="systemPage">
<div class="section">
- <div class="section-title" i18n-content="datetime_title"></div>
- <div class="option">
- <table class="option-control-table">
- <tr>
- <td class="option-name" i18n-content="timezone"></td>
- <td class="option-value">
- <select id="timezone-select" class="control"
- pref="settings.datetime.timezone"></select>
- </td>
- </tr>
- </table>
- </div>
- </div>
- <div class="section">
<div class="section-title" i18n-content="touchpad"></div>
<table class="option-control-table">
<tr>
diff --git a/chrome/browser/resources/options/chromeos_system_options.js b/chrome/browser/resources/options/chromeos_system_options.js
index 3741233..48af6ae 100644
--- a/chrome/browser/resources/options/chromeos_system_options.js
+++ b/chrome/browser/resources/options/chromeos_system_options.js
@@ -31,11 +31,12 @@ SystemOptions.prototype = {
initializePage: function() {
OptionsPage.prototype.initializePage.call(this);
var timezone = $('timezone-select');
- timezone.initializeValues(templateData.timezoneList);
+ if (timezone) {
+ timezone.initializeValues(templateData.timezoneList);
+ }
$('language-button').onclick = function(event) {
// TODO: Open ChromeOS language settings page.
};
},
};
-