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

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

Issue 9386032: [uber page] Migrate the virtual keyboard sub-page to a dialog (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: var rename Created 8 years, 10 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/options2/options.html ('k') | chrome/browser/resources/options2/options_page.js » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/resources/options2/options.js
diff --git a/chrome/browser/resources/options2/options.js b/chrome/browser/resources/options2/options.js
index d2a0db51957d0d2b7ca7148a0ec2957e4307fd25..50fa893a45052f0d0a5a9f0f3b19a0cd2d7798b7 100644
--- a/chrome/browser/resources/options2/options.js
+++ b/chrome/browser/resources/options2/options.js
@@ -77,16 +77,6 @@ function load() {
AdvancedOptions.getInstance(),
[$('privacyContentSettingsButton')]);
- if (cr.isChromeOS) {
- // Only use the VirtualKeyboardManager if the keyboard DOM elements (which
- // it will assume exists) are present (i.e. if we were built with
- // USE_VIRTUAL_KEYBOARD).
- if ($('language-options-virtual-keyboard')) {
- OptionsPage.registerSubPage(VirtualKeyboardManager.getInstance(),
- LanguageOptions.getInstance());
- }
- }
-
// ContentSettings sub-pages.
OptionsPage.registerSubPage(ContentSettingsExceptionsArea.getInstance(),
ContentSettings.getInstance());
@@ -197,6 +187,13 @@ function load() {
templateData.languagePinyinPageTabTitle,
'languagePinyinPage'),
LanguageOptions.getInstance());
+ // Only use the VirtualKeyboardManager if the keyboard DOM elements (which
+ // it will assume exists) are present (i.e. if we were built with
+ // use_virtual_keyboard=1).
+ if ($('language-options-virtual-keyboard')) {
+ OptionsPage.registerOverlay(VirtualKeyboardManager.getInstance(),
+ LanguageOptions.getInstance());
+ }
}
if (!cr.isWindows && !cr.isMac) {
OptionsPage.registerOverlay(CertificateBackupOverlay.getInstance(),
« no previous file with comments | « chrome/browser/resources/options2/options.html ('k') | chrome/browser/resources/options2/options_page.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698