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

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

Issue 1085923002: Rename use_nss to use_nss_certs in gyp and grit. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: wrapping Created 5 years, 8 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
« no previous file with comments | « chrome/browser/resources/options/options.html ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 // This file exists to aggregate all of the javascript used by the 5 // This file exists to aggregate all of the javascript used by the
6 // settings page into a single file which will be flattened and served 6 // settings page into a single file which will be flattened and served
7 // as a single resource. 7 // as a single resource.
8 <include src="preferences.js"> 8 <include src="preferences.js">
9 <include src="controlled_setting.js"> 9 <include src="controlled_setting.js">
10 <include src="deletable_item_list.js"> 10 <include src="deletable_item_list.js">
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
46 var DetailsInternetPage = options.internet.DetailsInternetPage; 46 var DetailsInternetPage = options.internet.DetailsInternetPage;
47 var DisplayOptions = options.DisplayOptions; 47 var DisplayOptions = options.DisplayOptions;
48 var DisplayOverscan = options.DisplayOverscan; 48 var DisplayOverscan = options.DisplayOverscan;
49 var BluetoothOptions = options.BluetoothOptions; 49 var BluetoothOptions = options.BluetoothOptions;
50 var BluetoothPairing = options.BluetoothPairing; 50 var BluetoothPairing = options.BluetoothPairing;
51 var KeyboardOverlay = options.KeyboardOverlay; 51 var KeyboardOverlay = options.KeyboardOverlay;
52 var PointerOverlay = options.PointerOverlay; 52 var PointerOverlay = options.PointerOverlay;
53 var PowerOverlay = options.PowerOverlay; 53 var PowerOverlay = options.PowerOverlay;
54 var UIAccountTweaks = uiAccountTweaks.UIAccountTweaks; 54 var UIAccountTweaks = uiAccountTweaks.UIAccountTweaks;
55 </if> 55 </if>
56 <if expr="use_nss"> 56 <if expr="use_nss_certs">
57 <include src="certificate_tree.js"> 57 <include src="certificate_tree.js">
58 <include src="certificate_manager.js"> 58 <include src="certificate_manager.js">
59 <include src="certificate_restore_overlay.js"> 59 <include src="certificate_restore_overlay.js">
60 <include src="certificate_backup_overlay.js"> 60 <include src="certificate_backup_overlay.js">
61 <include src="certificate_edit_ca_trust_overlay.js"> 61 <include src="certificate_edit_ca_trust_overlay.js">
62 <include src="certificate_import_error_overlay.js"> 62 <include src="certificate_import_error_overlay.js">
63 var CertificateManager = options.CertificateManager; 63 var CertificateManager = options.CertificateManager;
64 var CertificateRestoreOverlay = options.CertificateRestoreOverlay; 64 var CertificateRestoreOverlay = options.CertificateRestoreOverlay;
65 var CertificateBackupOverlay = options.CertificateBackupOverlay; 65 var CertificateBackupOverlay = options.CertificateBackupOverlay;
66 var CertificateEditCaTrustOverlay = options.CertificateEditCaTrustOverlay; 66 var CertificateEditCaTrustOverlay = options.CertificateEditCaTrustOverlay;
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
120 <include src="website_settings.js"> 120 <include src="website_settings.js">
121 <include src="website_settings_edit_page.js"> 121 <include src="website_settings_edit_page.js">
122 <include src="../help/help_page.js"> 122 <include src="../help/help_page.js">
123 <include src="sync_setup_overlay.js"> 123 <include src="sync_setup_overlay.js">
124 <include src="../uber/uber_page_manager_observer.js"> 124 <include src="../uber/uber_page_manager_observer.js">
125 <include src="../uber/uber_utils.js"> 125 <include src="../uber/uber_utils.js">
126 <include src="options.js"> 126 <include src="options.js">
127 <if expr="enable_settings_app"> 127 <if expr="enable_settings_app">
128 <include src="options_settings_app.js"> 128 <include src="options_settings_app.js">
129 </if> 129 </if>
OLDNEW
« no previous file with comments | « chrome/browser/resources/options/options.html ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698