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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 11293267: Put the pop-up app launcher behind a compile-time flag, and provide defines. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: unifdef controller from startup, lets us do nicer excludes Created 8 years, 1 month 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/browser/ui/app_list/app_list_controller.cc » ('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"></include> 8 <include src="preferences.js"></include>
9 <include src="options_bubble.js"></include> 9 <include src="options_bubble.js"></include>
10 <include src="controlled_setting.js"></include> 10 <include src="controlled_setting.js"></include>
(...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after
88 <include src="password_manager.js"></include> 88 <include src="password_manager.js"></include>
89 <include src="password_manager_list.js"></include> 89 <include src="password_manager_list.js"></include>
90 <include src="profiles_icon_grid.js"></include> 90 <include src="profiles_icon_grid.js"></include>
91 <include src="search_engine_manager.js"></include> 91 <include src="search_engine_manager.js"></include>
92 <include src="search_engine_manager_engine_list.js"></include> 92 <include src="search_engine_manager_engine_list.js"></include>
93 <include src="search_page.js"></include> 93 <include src="search_page.js"></include>
94 <include src="startup_overlay.js"></include> 94 <include src="startup_overlay.js"></include>
95 <include src="../sync_setup_overlay.js"></include> 95 <include src="../sync_setup_overlay.js"></include>
96 <include src="../uber/uber_utils.js"></include> 96 <include src="../uber/uber_utils.js"></include>
97 <include src="options.js"></include> 97 <include src="options.js"></include>
98 <if expr="is_win"> 98 <if expr="pp_ifdef('enable_settings_app')">
99 <include src="options_settings_app.js"></include> 99 <include src="options_settings_app.js"></include>
100 </if> 100 </if>
OLDNEW
« no previous file with comments | « chrome/browser/resources/options/options.html ('k') | chrome/browser/ui/app_list/app_list_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698