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

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

Issue 2334003006: Merges two options reset overlay classes (Closed)
Patch Set: Fix variable name. Created 4 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
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 107 matching lines...) Expand 10 before | Expand all | Expand 10 after
118 <include src="search_engine_manager_engine_list.js"> 118 <include src="search_engine_manager_engine_list.js">
119 <include src="search_page.js"> 119 <include src="search_page.js">
120 <include src="startup_overlay.js"> 120 <include src="startup_overlay.js">
121 <include src="supervised_user_create_confirm.js"> 121 <include src="supervised_user_create_confirm.js">
122 <include src="supervised_user_import.js"> 122 <include src="supervised_user_import.js">
123 <include src="supervised_user_learn_more.js"> 123 <include src="supervised_user_learn_more.js">
124 <include src="supervised_user_list.js"> 124 <include src="supervised_user_list.js">
125 <include src="supervised_user_list_data.js"> 125 <include src="supervised_user_list_data.js">
126 <include src="../help/help_page.js"> 126 <include src="../help/help_page.js">
127 <include src="sync_setup_overlay.js"> 127 <include src="sync_setup_overlay.js">
128 <if expr="is_win">
129 <include src="triggered_reset_profile_settings_overlay.js">
130 </if>
131 <include src="../uber/uber_page_manager_observer.js"> 128 <include src="../uber/uber_page_manager_observer.js">
132 <include src="../uber/uber_utils.js"> 129 <include src="../uber/uber_utils.js">
133 <include src="options.js"> 130 <include src="options.js">
OLDNEW
« no previous file with comments | « chrome/browser/resources/options/options.js ('k') | chrome/browser/resources/options/reset_profile_settings_overlay.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698