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

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side Diff: chrome/browser/resources/options/options_bundle.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 to head Created 9 years, 4 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
« no previous file with comments | « chrome/browser/resources/options/options.js ('k') | chrome/browser/ui/intents/intents_model.h » ('j') | chrome/browser/ui/intents/intents_model.h » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 // 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="pref_ui.js"></include> 9 <include src="pref_ui.js"></include>
10 <include src="deletable_item_list.js"></include> 10 <include src="deletable_item_list.js"></include>
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
61 <include src="content_settings_ui.js"></include> 61 <include src="content_settings_ui.js"></include>
62 <include src="cookies_list.js"></include> 62 <include src="cookies_list.js"></include>
63 <include src="cookies_view.js"></include> 63 <include src="cookies_view.js"></include>
64 <include src="font_settings.js"></include> 64 <include src="font_settings.js"></include>
65 <if expr="pp_ifdef('enable_register_protocol_handler')"> 65 <if expr="pp_ifdef('enable_register_protocol_handler')">
66 <include src="handler_options.js"></script> 66 <include src="handler_options.js"></script>
67 <include src="handler_options_list.js"></script> 67 <include src="handler_options_list.js"></script>
68 </if> 68 </if>
69 <include src="import_data_overlay.js"></include> 69 <include src="import_data_overlay.js"></include>
70 <include src="instant_confirm_overlay.js"></include> 70 <include src="instant_confirm_overlay.js"></include>
71 <if expr="pp_ifdef('enable_web_intents')">
72 <include src="intents_list.js"></include>
73 <include src="intents_view.js"></include>
74 </if>
71 <include src="language_add_language_overlay.js"></include> 75 <include src="language_add_language_overlay.js"></include>
72 <include src="language_list.js"></include> 76 <include src="language_list.js"></include>
73 <include src="language_options.js"></include> 77 <include src="language_options.js"></include>
74 <include src="manage_profile_overlay.js"></include> 78 <include src="manage_profile_overlay.js"></include>
75 <include src="password_manager.js"></include> 79 <include src="password_manager.js"></include>
76 <include src="password_manager_list.js"></include> 80 <include src="password_manager_list.js"></include>
77 <include src="personal_options.js"></include> 81 <include src="personal_options.js"></include>
78 <include src="personal_options_profile_list.js"></include> 82 <include src="personal_options_profile_list.js"></include>
79 <include src="profiles_icon_grid.js"></include> 83 <include src="profiles_icon_grid.js"></include>
80 <include src="search_engine_manager.js"></include> 84 <include src="search_engine_manager.js"></include>
81 <include src="search_engine_manager_engine_list.js"></include> 85 <include src="search_engine_manager_engine_list.js"></include>
82 <include src="search_page.js"></include> 86 <include src="search_page.js"></include>
83 <include src="../sync_setup_overlay.js"></include> 87 <include src="../sync_setup_overlay.js"></include>
84 <include src="options.js"></include> 88 <include src="options.js"></include>
OLDNEW
« no previous file with comments | « chrome/browser/resources/options/options.js ('k') | chrome/browser/ui/intents/intents_model.h » ('j') | chrome/browser/ui/intents/intents_model.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698