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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 445503003: Update easy unlock settings UI. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: add spinner Created 6 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/webui/options/browser_options_handler.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"> 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 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
70 <include src="browser_options.js"> 70 <include src="browser_options.js">
71 <include src="browser_options_profile_list.js"> 71 <include src="browser_options_profile_list.js">
72 <include src="browser_options_startup_page_list.js"> 72 <include src="browser_options_startup_page_list.js">
73 <include src="clear_browser_data_overlay.js"> 73 <include src="clear_browser_data_overlay.js">
74 <include src="confirm_dialog.js"> 74 <include src="confirm_dialog.js">
75 <include src="content_settings.js"> 75 <include src="content_settings.js">
76 <include src="content_settings_exceptions_area.js"> 76 <include src="content_settings_exceptions_area.js">
77 <include src="content_settings_ui.js"> 77 <include src="content_settings_ui.js">
78 <include src="cookies_list.js"> 78 <include src="cookies_list.js">
79 <include src="cookies_view.js"> 79 <include src="cookies_view.js">
80 <include src="easy_unlock_turn_off_overlay.js">
80 <include src="factory_reset_overlay.js"> 81 <include src="factory_reset_overlay.js">
81 <include src="font_settings.js"> 82 <include src="font_settings.js">
82 <if expr="enable_google_now"> 83 <if expr="enable_google_now">
83 <include src="geolocation_options.js"> 84 <include src="geolocation_options.js">
84 </if> 85 </if>
85 <include src="handler_options.js"> 86 <include src="handler_options.js">
86 <include src="handler_options_list.js"> 87 <include src="handler_options_list.js">
87 <include src="home_page_overlay.js"> 88 <include src="home_page_overlay.js">
88 <include src="hotword_confirm_dialog.js"> 89 <include src="hotword_confirm_dialog.js">
89 <include src="import_data_overlay.js"> 90 <include src="import_data_overlay.js">
(...skipping 20 matching lines...) Expand all
110 <include src="supervised_user_learn_more.js"> 111 <include src="supervised_user_learn_more.js">
111 <include src="supervised_user_list.js"> 112 <include src="supervised_user_list.js">
112 <include src="supervised_user_list_data.js"> 113 <include src="supervised_user_list_data.js">
113 <include src="website_settings.js"> 114 <include src="website_settings.js">
114 <include src="../sync_setup_overlay.js"> 115 <include src="../sync_setup_overlay.js">
115 <include src="../uber/uber_utils.js"> 116 <include src="../uber/uber_utils.js">
116 <include src="options.js"> 117 <include src="options.js">
117 <if expr="enable_settings_app"> 118 <if expr="enable_settings_app">
118 <include src="options_settings_app.js"> 119 <include src="options_settings_app.js">
119 </if> 120 </if>
OLDNEW
« no previous file with comments | « chrome/browser/resources/options/options.js ('k') | chrome/browser/ui/webui/options/browser_options_handler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698