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

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

Issue 10636019: Adding Application Data dialog for isolated apps (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fixed merge conflicts Created 8 years, 5 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) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 AlertOverlay = options.AlertOverlay; 6 var AlertOverlay = options.AlertOverlay;
7 var AutofillEditAddressOverlay = options.AutofillEditAddressOverlay; 7 var AutofillEditAddressOverlay = options.AutofillEditAddressOverlay;
8 var AutofillEditCreditCardOverlay = options.AutofillEditCreditCardOverlay; 8 var AutofillEditCreditCardOverlay = options.AutofillEditCreditCardOverlay;
9 var AutofillOptions = options.AutofillOptions; 9 var AutofillOptions = options.AutofillOptions;
10 var BrowserOptions = options.BrowserOptions; 10 var BrowserOptions = options.BrowserOptions;
11 var ClearBrowserDataOverlay = options.ClearBrowserDataOverlay; 11 var ClearBrowserDataOverlay = options.ClearBrowserDataOverlay;
12 var ContentSettings = options.ContentSettings; 12 var ContentSettings = options.ContentSettings;
13 var ContentSettingsExceptionsArea = 13 var ContentSettingsExceptionsArea =
14 options.contentSettings.ContentSettingsExceptionsArea; 14 options.contentSettings.ContentSettingsExceptionsArea;
15 var CookiesView = options.CookiesView; 15 var CookiesView = options.CookiesView;
16 var CookiesViewApp = options.CookiesViewApp;
16 var FontSettings = options.FontSettings; 17 var FontSettings = options.FontSettings;
17 var HandlerOptions = options.HandlerOptions; 18 var HandlerOptions = options.HandlerOptions;
18 var HomePageOverlay = options.HomePageOverlay; 19 var HomePageOverlay = options.HomePageOverlay;
19 var ImportDataOverlay = options.ImportDataOverlay; 20 var ImportDataOverlay = options.ImportDataOverlay;
20 var InstantConfirmOverlay = options.InstantConfirmOverlay; 21 var InstantConfirmOverlay = options.InstantConfirmOverlay;
21 var LanguageOptions = options.LanguageOptions; 22 var LanguageOptions = options.LanguageOptions;
22 var MediaGalleryManager = options.MediaGalleryManager; 23 var MediaGalleryManager = options.MediaGalleryManager;
23 var OptionsFocusManager = options.OptionsFocusManager; 24 var OptionsFocusManager = options.OptionsFocusManager;
24 var OptionsPage = options.OptionsPage; 25 var OptionsPage = options.OptionsPage;
25 var PasswordManager = options.PasswordManager; 26 var PasswordManager = options.PasswordManager;
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
72 [$('privacyClearDataButton')]); 73 [$('privacyClearDataButton')]);
73 OptionsPage.registerOverlay(ContentSettings.getInstance(), 74 OptionsPage.registerOverlay(ContentSettings.getInstance(),
74 BrowserOptions.getInstance(), 75 BrowserOptions.getInstance(),
75 [$('privacyContentSettingsButton')]); 76 [$('privacyContentSettingsButton')]);
76 OptionsPage.registerOverlay(ContentSettingsExceptionsArea.getInstance(), 77 OptionsPage.registerOverlay(ContentSettingsExceptionsArea.getInstance(),
77 ContentSettings.getInstance()); 78 ContentSettings.getInstance());
78 OptionsPage.registerOverlay(CookiesView.getInstance(), 79 OptionsPage.registerOverlay(CookiesView.getInstance(),
79 ContentSettings.getInstance(), 80 ContentSettings.getInstance(),
80 [$('privacyContentSettingsButton'), 81 [$('privacyContentSettingsButton'),
81 $('show-cookies-button')]); 82 $('show-cookies-button')]);
83 OptionsPage.registerOverlay(CookiesViewApp.getInstance(),
84 ContentSettings.getInstance(),
85 [$('privacyContentSettingsButton'),
86 $('show-app-cookies-button')]);
82 OptionsPage.registerOverlay(FontSettings.getInstance(), 87 OptionsPage.registerOverlay(FontSettings.getInstance(),
83 BrowserOptions.getInstance(), 88 BrowserOptions.getInstance(),
84 [$('fontSettingsCustomizeFontsButton')]); 89 [$('fontSettingsCustomizeFontsButton')]);
85 if (HandlerOptions && $('manage-handlers-button')) { 90 if (HandlerOptions && $('manage-handlers-button')) {
86 OptionsPage.registerOverlay(HandlerOptions.getInstance(), 91 OptionsPage.registerOverlay(HandlerOptions.getInstance(),
87 ContentSettings.getInstance(), 92 ContentSettings.getInstance(),
88 [$('manage-handlers-button')]); 93 [$('manage-handlers-button')]);
89 } 94 }
90 OptionsPage.registerOverlay(HomePageOverlay.getInstance(), 95 OptionsPage.registerOverlay(HomePageOverlay.getInstance(),
91 BrowserOptions.getInstance(), 96 BrowserOptions.getInstance(),
(...skipping 130 matching lines...) Expand 10 before | Expand all | Expand 10 after
222 options.OptionsPage.willClose(); 227 options.OptionsPage.willClose();
223 }; 228 };
224 229
225 /** 230 /**
226 * Listener for the |popstate| event. 231 * Listener for the |popstate| event.
227 * @param {Event} e The |popstate| event. 232 * @param {Event} e The |popstate| event.
228 */ 233 */
229 window.onpopstate = function(e) { 234 window.onpopstate = function(e) {
230 options.OptionsPage.setState(e.state); 235 options.OptionsPage.setState(e.state);
231 }; 236 };
OLDNEW
« no previous file with comments | « chrome/browser/resources/options2/options.html ('k') | chrome/browser/resources/options2/options_bundle.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698