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

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

Issue 7719029: Revert 97966 : Revert 97955 - First pass on intents options UI. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Merge head Created 9 years, 3 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 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;
11 var BrowserOptions = options.BrowserOptions; 11 var BrowserOptions = options.BrowserOptions;
12 var ClearBrowserDataOverlay = options.ClearBrowserDataOverlay; 12 var ClearBrowserDataOverlay = options.ClearBrowserDataOverlay;
13 var ContentSettings = options.ContentSettings; 13 var ContentSettings = options.ContentSettings;
14 var ContentSettingsExceptionsArea = 14 var ContentSettingsExceptionsArea =
15 options.contentSettings.ContentSettingsExceptionsArea; 15 options.contentSettings.ContentSettingsExceptionsArea;
16 var CookiesView = options.CookiesView; 16 var CookiesView = options.CookiesView;
17 var FontSettings = options.FontSettings; 17 var FontSettings = options.FontSettings;
18 var HandlerOptions = options.HandlerOptions; 18 var HandlerOptions = options.HandlerOptions;
19 var ImportDataOverlay = options.ImportDataOverlay; 19 var ImportDataOverlay = options.ImportDataOverlay;
20 var IntentsView = options.IntentsView;
20 var InstantConfirmOverlay = options.InstantConfirmOverlay; 21 var InstantConfirmOverlay = options.InstantConfirmOverlay;
21 var LanguageOptions = options.LanguageOptions; 22 var LanguageOptions = options.LanguageOptions;
22 var OptionsPage = options.OptionsPage; 23 var OptionsPage = options.OptionsPage;
23 var PasswordManager = options.PasswordManager; 24 var PasswordManager = options.PasswordManager;
24 var PersonalOptions = options.PersonalOptions; 25 var PersonalOptions = options.PersonalOptions;
25 var Preferences = options.Preferences; 26 var Preferences = options.Preferences;
26 var ManageProfileOverlay = options.ManageProfileOverlay; 27 var ManageProfileOverlay = options.ManageProfileOverlay;
27 var ProxyOptions = options.ProxyOptions; 28 var ProxyOptions = options.ProxyOptions;
28 var SearchEngineManager = options.SearchEngineManager; 29 var SearchEngineManager = options.SearchEngineManager;
29 var SearchPage = options.SearchPage; 30 var SearchPage = options.SearchPage;
(...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after
113 OptionsPage.registerSubPage(CookiesView.getInstance(), 114 OptionsPage.registerSubPage(CookiesView.getInstance(),
114 ContentSettings.getInstance(), 115 ContentSettings.getInstance(),
115 [$('privacyContentSettingsButton'), 116 [$('privacyContentSettingsButton'),
116 $('show-cookies-button')]); 117 $('show-cookies-button')]);
117 // If HandlerOptions is null it means it got compiled out. 118 // If HandlerOptions is null it means it got compiled out.
118 if (HandlerOptions) { 119 if (HandlerOptions) {
119 OptionsPage.registerSubPage(HandlerOptions.getInstance(), 120 OptionsPage.registerSubPage(HandlerOptions.getInstance(),
120 ContentSettings.getInstance(), 121 ContentSettings.getInstance(),
121 [$('manage-handlers-button')]); 122 [$('manage-handlers-button')]);
122 } 123 }
124 if (IntentsView && $('manage-intents-button')) {
125 OptionsPage.registerSubPage(IntentsView.getInstance(),
126 ContentSettings.getInstance(),
127 [$('manage-intents-button')]);
128 }
123 OptionsPage.registerSubPage(FontSettings.getInstance(), 129 OptionsPage.registerSubPage(FontSettings.getInstance(),
124 AdvancedOptions.getInstance(), 130 AdvancedOptions.getInstance(),
125 [$('fontSettingsCustomizeFontsButton')]); 131 [$('fontSettingsCustomizeFontsButton')]);
126 if (!cr.isChromeOS) { 132 if (!cr.isChromeOS) {
127 OptionsPage.registerSubPage(LanguageOptions.getInstance(), 133 OptionsPage.registerSubPage(LanguageOptions.getInstance(),
128 AdvancedOptions.getInstance(), 134 AdvancedOptions.getInstance(),
129 [$('language-button')]); 135 [$('language-button')]);
130 } 136 }
131 if (!cr.isWindows && !cr.isMac) { 137 if (!cr.isWindows && !cr.isMac) {
132 OptionsPage.registerSubPage(CertificateManager.getInstance(), 138 OptionsPage.registerSubPage(CertificateManager.getInstance(),
(...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after
221 227
222 document.addEventListener('DOMContentLoaded', load); 228 document.addEventListener('DOMContentLoaded', load);
223 229
224 window.onpopstate = function(e) { 230 window.onpopstate = function(e) {
225 options.OptionsPage.setState(e.state); 231 options.OptionsPage.setState(e.state);
226 }; 232 };
227 233
228 window.onbeforeunload = function() { 234 window.onbeforeunload = function() {
229 options.OptionsPage.willClose(); 235 options.OptionsPage.willClose();
230 }; 236 };
OLDNEW
« no previous file with comments | « chrome/browser/resources/options/options.html ('k') | chrome/browser/resources/options/options_bundle.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698