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

Side by Side Diff: chrome/browser/resources/options/options.js

Issue 8695007: Replace TOUCH_UI condition in WebUI with dynamic flag. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Remove languages tweak and fix keyboard Created 9 years 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 var AddLanguageOverlay = options.AddLanguageOverlay; 5 var AddLanguageOverlay = options.AddLanguageOverlay;
6 var AdvancedOptions = options.AdvancedOptions; 6 var AdvancedOptions = options.AdvancedOptions;
7 var AlertOverlay = options.AlertOverlay; 7 var AlertOverlay = options.AlertOverlay;
8 var AutofillEditAddressOverlay = options.AutofillEditAddressOverlay; 8 var AutofillEditAddressOverlay = options.AutofillEditAddressOverlay;
9 var AutofillEditCreditCardOverlay = options.AutofillEditCreditCardOverlay; 9 var AutofillEditCreditCardOverlay = options.AutofillEditCreditCardOverlay;
10 var AutofillOptions = options.AutofillOptions; 10 var AutofillOptions = options.AutofillOptions;
(...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after
94 OptionsPage.registerSubPage( 94 OptionsPage.registerSubPage(
95 new OptionsPage('languageMozc', 95 new OptionsPage('languageMozc',
96 templateData.languageMozcPageTabTitle, 96 templateData.languageMozcPageTabTitle,
97 'languageMozcPage'), 97 'languageMozcPage'),
98 LanguageOptions.getInstance()); 98 LanguageOptions.getInstance());
99 OptionsPage.registerSubPage( 99 OptionsPage.registerSubPage(
100 new OptionsPage('languagePinyin', 100 new OptionsPage('languagePinyin',
101 templateData.languagePinyinPageTabTitle, 101 templateData.languagePinyinPageTabTitle,
102 'languagePinyinPage'), 102 'languagePinyinPage'),
103 LanguageOptions.getInstance()); 103 LanguageOptions.getInstance());
104 if (cr.isTouch) { 104 if ($('language-options-virtual-keyboard')) {
105 OptionsPage.registerSubPage(VirtualKeyboardManager.getInstance(), 105 OptionsPage.registerSubPage(VirtualKeyboardManager.getInstance(),
106 LanguageOptions.getInstance()); 106 LanguageOptions.getInstance());
107 } 107 }
108 OptionsPage.register(InternetOptions.getInstance()); 108 OptionsPage.register(InternetOptions.getInstance());
109 } 109 }
110 OptionsPage.register(AdvancedOptions.getInstance()); 110 OptionsPage.register(AdvancedOptions.getInstance());
111 OptionsPage.registerSubPage(ContentSettings.getInstance(), 111 OptionsPage.registerSubPage(ContentSettings.getInstance(),
112 AdvancedOptions.getInstance(), 112 AdvancedOptions.getInstance(),
113 [$('privacyContentSettingsButton')]); 113 [$('privacyContentSettingsButton')]);
114 OptionsPage.registerSubPage(ContentSettingsExceptionsArea.getInstance(), 114 OptionsPage.registerSubPage(ContentSettingsExceptionsArea.getInstance(),
(...skipping 118 matching lines...) Expand 10 before | Expand all | Expand 10 after
233 233
234 document.addEventListener('DOMContentLoaded', load); 234 document.addEventListener('DOMContentLoaded', load);
235 235
236 window.onpopstate = function(e) { 236 window.onpopstate = function(e) {
237 options.OptionsPage.setState(e.state); 237 options.OptionsPage.setState(e.state);
238 }; 238 };
239 239
240 window.onbeforeunload = function() { 240 window.onbeforeunload = function() {
241 options.OptionsPage.willClose(); 241 options.OptionsPage.willClose();
242 }; 242 };
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698