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

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: Tiny tweaks based on CR feedback 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 85 matching lines...) Expand 10 before | Expand all | Expand 10 after
96 OptionsPage.registerSubPage( 96 OptionsPage.registerSubPage(
97 new OptionsPage('languageMozc', 97 new OptionsPage('languageMozc',
98 templateData.languageMozcPageTabTitle, 98 templateData.languageMozcPageTabTitle,
99 'languageMozcPage'), 99 'languageMozcPage'),
100 LanguageOptions.getInstance()); 100 LanguageOptions.getInstance());
101 OptionsPage.registerSubPage( 101 OptionsPage.registerSubPage(
102 new OptionsPage('languagePinyin', 102 new OptionsPage('languagePinyin',
103 templateData.languagePinyinPageTabTitle, 103 templateData.languagePinyinPageTabTitle,
104 'languagePinyinPage'), 104 'languagePinyinPage'),
105 LanguageOptions.getInstance()); 105 LanguageOptions.getInstance());
106 if (cr.isTouch) { 106 // Only use the VirtualKeyboardManager if the keyboard DOM elements (which
107 // it will assume exists) are present (i.e. if we were built with
108 // USE_VIRTUAL_KEYBOARD).
109 if ($('language-options-virtual-keyboard')) {
107 OptionsPage.registerSubPage(VirtualKeyboardManager.getInstance(), 110 OptionsPage.registerSubPage(VirtualKeyboardManager.getInstance(),
108 LanguageOptions.getInstance()); 111 LanguageOptions.getInstance());
109 } 112 }
110 OptionsPage.register(InternetOptions.getInstance()); 113 OptionsPage.register(InternetOptions.getInstance());
111 } 114 }
112 OptionsPage.register(AdvancedOptions.getInstance()); 115 OptionsPage.register(AdvancedOptions.getInstance());
113 OptionsPage.registerSubPage(ContentSettings.getInstance(), 116 OptionsPage.registerSubPage(ContentSettings.getInstance(),
114 AdvancedOptions.getInstance(), 117 AdvancedOptions.getInstance(),
115 [$('privacyContentSettingsButton')]); 118 [$('privacyContentSettingsButton')]);
116 OptionsPage.registerSubPage(ContentSettingsExceptionsArea.getInstance(), 119 OptionsPage.registerSubPage(ContentSettingsExceptionsArea.getInstance(),
(...skipping 118 matching lines...) Expand 10 before | Expand all | Expand 10 after
235 238
236 document.addEventListener('DOMContentLoaded', load); 239 document.addEventListener('DOMContentLoaded', load);
237 240
238 window.onpopstate = function(e) { 241 window.onpopstate = function(e) {
239 options.OptionsPage.setState(e.state); 242 options.OptionsPage.setState(e.state);
240 }; 243 };
241 244
242 window.onbeforeunload = function() { 245 window.onbeforeunload = function() {
243 options.OptionsPage.willClose(); 246 options.OptionsPage.willClose();
244 }; 247 };
OLDNEW
« no previous file with comments | « chrome/browser/resources/options/language_options.js ('k') | chrome/browser/resources/options/options_page.css » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698