Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(852)

Unified Diff: chrome/browser/resources/options/options.js

Issue 6296017: dom-ui settings: enable languages & spell checker settings for all platforms.... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: code review tweak Created 9 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/resources/options/language_options.js ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/resources/options/options.js
===================================================================
--- chrome/browser/resources/options/options.js (revision 71884)
+++ chrome/browser/resources/options/options.js (working copy)
@@ -75,22 +75,22 @@
new OptionsPage('languageChewing',
localStrings.getString('languageChewingPage'),
'languageChewingPage'),
- SystemOptions.getInstance());
+ LanguageOptions.getInstance());
OptionsPage.registerSubPage(
new OptionsPage('languageHangul',
localStrings.getString('languageHangulPage'),
'languageHangulPage'),
- SystemOptions.getInstance());
+ LanguageOptions.getInstance());
OptionsPage.registerSubPage(
new OptionsPage('languageMozc',
localStrings.getString('languageMozcPage'),
'languageMozcPage'),
- SystemOptions.getInstance());
+ LanguageOptions.getInstance());
OptionsPage.registerSubPage(
new OptionsPage('languagePinyin',
localStrings.getString('languagePinyinPage'),
'languagePinyinPage'),
- SystemOptions.getInstance());
+ LanguageOptions.getInstance());
OptionsPage.register(InternetOptions.getInstance());
}
OptionsPage.register(AdvancedOptions.getInstance());
@@ -106,6 +106,11 @@
OptionsPage.registerSubPage(FontSettings.getInstance(),
AdvancedOptions.getInstance(),
[$('fontSettingsCustomizeFontsButton')]);
+ if (!cr.isChromeOS) {
+ OptionsPage.registerSubPage(LanguageOptions.getInstance(),
+ AdvancedOptions.getInstance(),
+ [$('language-button')]);
+ }
if (!cr.isWindows && !cr.isMac) {
OptionsPage.registerSubPage(CertificateManager.getInstance(),
AdvancedOptions.getInstance(),
@@ -167,8 +172,14 @@
// Allow platform specific CSS rules.
if (cr.isMac)
document.documentElement.setAttribute('os', 'mac');
- if (cr.isLinux)
+ if (cr.isWindows)
+ document.documentElement.setAttribute('os', 'windows');
+ if (cr.isChromeOS)
+ document.documentElement.setAttribute('os', 'chromeos');
+ if (cr.isLinux) {
+ document.documentElement.setAttribute('os', 'linux');
document.documentElement.setAttribute('toolkit', 'gtk');
+ }
if (cr.isViews)
document.documentElement.setAttribute('toolkit', 'views');
« no previous file with comments | « chrome/browser/resources/options/language_options.js ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698