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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 12594029: Create interface to manage manual exceptions. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Load the overlay only when managed users are available. Created 7 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 | Annotate | Revision Log
« no previous file with comments | « chrome/browser/resources/options/options.js ('k') | chrome/browser/ui/webui/options/managed_user_settings_handler.h » ('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="controlled_setting.js"></include> 9 <include src="controlled_setting.js"></include>
10 <include src="deletable_item_list.js"></include> 10 <include src="deletable_item_list.js"></include>
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
69 <include src="browser_options_startup_page_list.js"></include> 69 <include src="browser_options_startup_page_list.js"></include>
70 <include src="clear_browser_data_overlay.js"></include> 70 <include src="clear_browser_data_overlay.js"></include>
71 <include src="confirm_dialog.js"></include> 71 <include src="confirm_dialog.js"></include>
72 <include src="content_settings.js"></include> 72 <include src="content_settings.js"></include>
73 <include src="content_settings2.js"></include> 73 <include src="content_settings2.js"></include>
74 <include src="content_settings_exceptions_area.js"></include> 74 <include src="content_settings_exceptions_area.js"></include>
75 <include src="content_settings_ui.js"></include> 75 <include src="content_settings_ui.js"></include>
76 <include src="cookies_list.js"></include> 76 <include src="cookies_list.js"></include>
77 <include src="cookies_view.js"></include> 77 <include src="cookies_view.js"></include>
78 <include src="factory_reset_overlay.js"></include> 78 <include src="factory_reset_overlay.js"></include>
79 <include src="managed_user_exceptions_area.js"></include>
79 <include src="managed_user_settings.js"></include> 80 <include src="managed_user_settings.js"></include>
80 <include src="managed_user_set_passphrase.js"></include> 81 <include src="managed_user_set_passphrase.js"></include>
81 <include src="font_settings.js"></include> 82 <include src="font_settings.js"></include>
82 <include src="handler_options.js"></include> 83 <include src="handler_options.js"></include>
83 <include src="handler_options_list.js"></include> 84 <include src="handler_options_list.js"></include>
84 <include src="home_page_overlay.js"></include> 85 <include src="home_page_overlay.js"></include>
85 <include src="import_data_overlay.js"></include> 86 <include src="import_data_overlay.js"></include>
86 <include src="language_add_language_overlay.js"></include> 87 <include src="language_add_language_overlay.js"></include>
87 <if expr="not is_macosx"> 88 <if expr="not is_macosx">
88 <include src="language_dictionary_overlay_word_list.js"></include> 89 <include src="language_dictionary_overlay_word_list.js"></include>
(...skipping 11 matching lines...) Expand all
100 <include src="search_engine_manager.js"></include> 101 <include src="search_engine_manager.js"></include>
101 <include src="search_engine_manager_engine_list.js"></include> 102 <include src="search_engine_manager_engine_list.js"></include>
102 <include src="search_page.js"></include> 103 <include src="search_page.js"></include>
103 <include src="startup_overlay.js"></include> 104 <include src="startup_overlay.js"></include>
104 <include src="../sync_setup_overlay.js"></include> 105 <include src="../sync_setup_overlay.js"></include>
105 <include src="../uber/uber_utils.js"></include> 106 <include src="../uber/uber_utils.js"></include>
106 <include src="options.js"></include> 107 <include src="options.js"></include>
107 <if expr="pp_ifdef('enable_settings_app')"> 108 <if expr="pp_ifdef('enable_settings_app')">
108 <include src="options_settings_app.js"></include> 109 <include src="options_settings_app.js"></include>
109 </if> 110 </if>
OLDNEW
« no previous file with comments | « chrome/browser/resources/options/options.js ('k') | chrome/browser/ui/webui/options/managed_user_settings_handler.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698