summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
authormazda@chromium.org <mazda@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-07-22 16:42:02 +0000
committermazda@chromium.org <mazda@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-07-22 16:42:02 +0000
commit3adab215b78455efc2e3c8d86eb7a8513a25211b (patch)
treeb3bef10170f9c50edd34b94e0205941099a903c6 /chrome
parent619467b4119557427d28ea4d12208ddd3d356180 (diff)
downloadchromium_src-3adab215b78455efc2e3c8d86eb7a8513a25211b.zip
chromium_src-3adab215b78455efc2e3c8d86eb7a8513a25211b.tar.gz
chromium_src-3adab215b78455efc2e3c8d86eb7a8513a25211b.tar.bz2
Use the data-values attribute in Hangul options dialog and delete the corresponding js file.
BUG=chromium-os:4806 TEST=manually on the netbook Review URL: http://codereview.chromium.org/3017026 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@53345 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
-rw-r--r--chrome/browser/resources/options.html6
-rw-r--r--chrome/browser/resources/options/chromeos_language_hangul_options.html4
-rw-r--r--chrome/browser/resources/options/chromeos_language_hangul_options.js32
3 files changed, 7 insertions, 35 deletions
diff --git a/chrome/browser/resources/options.html b/chrome/browser/resources/options.html
index 1ec6b26..d95b666 100644
--- a/chrome/browser/resources/options.html
+++ b/chrome/browser/resources/options.html
@@ -21,7 +21,6 @@
<script src="options/pref_ui.js"></script>
<script src="options/options_page.js"></script>
<if expr="pp_ifdef('chromeos')">
- <script src="options/chromeos_language_hangul_options.js"></script>
<script src="options/chromeos_system_options.js"></script>
<script src="options/chromeos_accounts_options.js"></script>
<script src="options/chromeos_accounts_user_list.js"></script>
@@ -52,7 +51,10 @@ function load() {
// 'languageChewing',
// localStrings.getString('languageChewingPage'),
// 'languageChewingPage'));
- // OptionsPage.register(LanguageHangulOptions.getInstance());
+ // OptionsPage.register(new OptionsPage(
+ // 'languageHangul',
+ // localStrings.getString('languageHangulPage'),
+ // 'languageHangulPage'));
}
OptionsPage.register(BrowserOptions.getInstance());
diff --git a/chrome/browser/resources/options/chromeos_language_hangul_options.html b/chrome/browser/resources/options/chromeos_language_hangul_options.html
index f6506b5..8e7e4932 100644
--- a/chrome/browser/resources/options/chromeos_language_hangul_options.html
+++ b/chrome/browser/resources/options/chromeos_language_hangul_options.html
@@ -1,4 +1,5 @@
<div class="page hidden" id="languageHangulPage">
+ <h1 i18n-content="languageHangulPage"></h1>
<section>
<div class="option">
<table class="option-control-table">
@@ -6,7 +7,8 @@
<td class="option-name" i18n-content="keyboard_layout"></td>
<td class="option-value">
<select id="keyboard-layout-select" class="control"
- pref="settings.language.hangul_keyboard"></select>
+ pref="settings.language.hangul_keyboard"
+ data-values="keyboardLayoutList"></select>
</td>
</tr>
</table>
diff --git a/chrome/browser/resources/options/chromeos_language_hangul_options.js b/chrome/browser/resources/options/chromeos_language_hangul_options.js
deleted file mode 100644
index df2331c7..0000000
--- a/chrome/browser/resources/options/chromeos_language_hangul_options.js
+++ /dev/null
@@ -1,32 +0,0 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-///////////////////////////////////////////////////////////////////////////////
-// LanguageHangulOptions class:
-
-/**
- * Encapsulated handling of ChromeOS language Hangul options page.
- * @constructor
- */
-function LanguageHangulOptions() {
- OptionsPage.call(this, 'languageHangul', templateData.languageHangulPage,
- 'languageHangulPage');
-}
-
-cr.addSingletonGetter(LanguageHangulOptions);
-
-// Inherit LanguageHangulOptions from OptionsPage.
-LanguageHangulOptions.prototype = {
- __proto__: OptionsPage.prototype,
-
- /**
- * Initializes LanguageHangulOptions page.
- * Calls base class implementation to starts preference initialization.
- */
- initializePage: function() {
- OptionsPage.prototype.initializePage.call(this);
- var keyboardLayout = $('keyboard-layout-select');
- keyboardLayout.initializeValues(templateData.keyboardLayoutList)
- }
-};