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

Side by Side Diff: chrome/browser/ui/webui/options/options_ui.cc

Issue 2728563003: Revert of fix quick unlock config in options (Closed)
Patch Set: Created 3 years, 9 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
« no previous file with comments | « chrome/browser/ui/webui/options/browser_options_handler.cc ('k') | no next file » | 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 #include "chrome/browser/ui/webui/options/options_ui.h" 5 #include "chrome/browser/ui/webui/options/options_ui.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <utility> 8 #include <utility>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 127 matching lines...) Expand 10 before | Expand all | Expand 10 after
138 constexpr char kLockScreenHTMLPath[] = "people_page/lock_screen.html"; 138 constexpr char kLockScreenHTMLPath[] = "people_page/lock_screen.html";
139 constexpr char kLockScreenJSPath[] = "people_page/lock_screen.js"; 139 constexpr char kLockScreenJSPath[] = "people_page/lock_screen.js";
140 constexpr char kSetupPinHTMLPath[] = "people_page/setup_pin_dialog.html"; 140 constexpr char kSetupPinHTMLPath[] = "people_page/setup_pin_dialog.html";
141 constexpr char kSetupPinJSPath[] = "people_page/setup_pin_dialog.js"; 141 constexpr char kSetupPinJSPath[] = "people_page/setup_pin_dialog.js";
142 constexpr char kFingerprintListHTMLPath[] = "people_page/fingerprint_list.html"; 142 constexpr char kFingerprintListHTMLPath[] = "people_page/fingerprint_list.html";
143 constexpr char kFingerprintListJSPath[] = "people_page/fingerprint_list.js"; 143 constexpr char kFingerprintListJSPath[] = "people_page/fingerprint_list.js";
144 constexpr char kSetupFingerprintHTMLPath[] = 144 constexpr char kSetupFingerprintHTMLPath[] =
145 "people_page/setup_fingerprint_dialog.html"; 145 "people_page/setup_fingerprint_dialog.html";
146 constexpr char kSetupFingerprintJSPath[] = 146 constexpr char kSetupFingerprintJSPath[] =
147 "people_page/setup_fingerprint_dialog.js"; 147 "people_page/setup_fingerprint_dialog.js";
148 constexpr char kFingerprintBrowserProxyHTMLPath[] =
149 "people_page/fingerprint_browser_proxy.html";
150 constexpr char kFingerprintBrowserProxyJSPath[] =
151 "people_page/fingerprint_browser_proxy.js";
152 constexpr char kFingerprintProgressArcHTMLPath[] =
153 "people_page/fingerprint_progress_arc.html";
154 constexpr char kFingerprintProgressArcJSPath[] =
155 "people_page/fingerprint_progress_arc.js";
156 constexpr char kSettingsRouteHTMLPath[] = "route.html"; 148 constexpr char kSettingsRouteHTMLPath[] = "route.html";
157 constexpr char kSettingsRouteJSPath[] = "route.js"; 149 constexpr char kSettingsRouteJSPath[] = "route.js";
158 constexpr char kSettingsSharedCSSHTMLPath[] = "settings_shared_css.html"; 150 constexpr char kSettingsSharedCSSHTMLPath[] = "settings_shared_css.html";
159 constexpr char kSettingsBooleanControlBehaviorHTMLPath[] = 151 constexpr char kSettingsBooleanControlBehaviorHTMLPath[] =
160 "controls/settings_boolean_control_behavior.html"; 152 "controls/settings_boolean_control_behavior.html";
161 constexpr char kSettingsBooleanControlBehaviorJSPath[] = 153 constexpr char kSettingsBooleanControlBehaviorJSPath[] =
162 "controls/settings_boolean_control_behavior.js"; 154 "controls/settings_boolean_control_behavior.js";
163 constexpr char kSettingsPrefControlBehaviorHTMLPath[] = 155 constexpr char kSettingsPrefControlBehaviorHTMLPath[] =
164 "controls/pref_control_behavior.html"; 156 "controls/pref_control_behavior.html";
165 constexpr char kSettingsPrefControlBehaviorJSPath[] = 157 constexpr char kSettingsPrefControlBehaviorJSPath[] =
166 "controls/pref_control_behavior.js"; 158 "controls/pref_control_behavior.js";
167 constexpr char kSettingsToggleButtonHTMLPath[] = 159 constexpr char kSettingsToggleButtonHTMLPath[] =
168 "controls/settings_toggle_button.html"; 160 "controls/settings_toggle_button.html";
169 constexpr char kSettingsToggleButtonJSPath[] = 161 constexpr char kSettingsToggleButtonJSPath[] =
170 "controls/settings_toggle_button.js"; 162 "controls/settings_toggle_button.js";
171 constexpr char kSettingsVarsCSSHTMLPath[] = "settings_vars_css.html"; 163 constexpr char kSettingsVarsCSSHTMLPath[] = "settings_vars_css.html";
172 constexpr char kSettingsPrefsBehaviorHTMLPath[] = "prefs/prefs_behavior.html"; 164 constexpr char kSettingsPrefsBehaviorHTMLPath[] = "prefs/prefs_behavior.html";
173 constexpr char kSettingsPrefsBehaviorJSPath[] = "prefs/prefs_behavior.js"; 165 constexpr char kSettingsPrefsBehaviorJSPath[] = "prefs/prefs_behavior.js";
174 constexpr char kSettingsPrefsTypesHTMLPath[] = "prefs/prefs_types.html"; 166 constexpr char kSettingsPrefsTypesHTMLPath[] = "prefs/prefs_types.html";
175 constexpr char kSettingsPrefsTypesJSPath[] = "prefs/prefs_types.js"; 167 constexpr char kSettingsPrefsTypesJSPath[] = "prefs/prefs_types.js";
176 constexpr char kSettingsPrefsHTMLPath[] = "prefs/prefs.html";
177 constexpr char kSettingsPrefsJSPath[] = "prefs/prefs.js";
178 constexpr char kSettingsI18nHTMLPath[] = "i18n_setup.html";
179 constexpr char kOptionsPolymerHTMLPath[] = "options_polymer.html"; 168 constexpr char kOptionsPolymerHTMLPath[] = "options_polymer.html";
180 #endif 169 #endif
181 170
182 } // namespace 171 } // namespace
183 172
184 namespace options { 173 namespace options {
185 174
186 //////////////////////////////////////////////////////////////////////////////// 175 ////////////////////////////////////////////////////////////////////////////////
187 // 176 //
188 // OptionsUIHTMLSource 177 // OptionsUIHTMLSource
(...skipping 140 matching lines...) Expand 10 before | Expand all | Expand 10 after
329 IDR_SETTINGS_TOGGLE_BUTTON_HTML; 318 IDR_SETTINGS_TOGGLE_BUTTON_HTML;
330 path_to_idr_map_[kSettingsToggleButtonJSPath] = IDR_SETTINGS_TOGGLE_BUTTON_JS; 319 path_to_idr_map_[kSettingsToggleButtonJSPath] = IDR_SETTINGS_TOGGLE_BUTTON_JS;
331 path_to_idr_map_[kSettingsVarsCSSHTMLPath] = IDR_SETTINGS_VARS_CSS_HTML; 320 path_to_idr_map_[kSettingsVarsCSSHTMLPath] = IDR_SETTINGS_VARS_CSS_HTML;
332 path_to_idr_map_[kSettingsPrefsBehaviorHTMLPath] = 321 path_to_idr_map_[kSettingsPrefsBehaviorHTMLPath] =
333 IDR_SETTINGS_PREFS_BEHAVIOR_HTML; 322 IDR_SETTINGS_PREFS_BEHAVIOR_HTML;
334 path_to_idr_map_[kSettingsPrefsBehaviorJSPath] = 323 path_to_idr_map_[kSettingsPrefsBehaviorJSPath] =
335 IDR_SETTINGS_PREFS_BEHAVIOR_JS; 324 IDR_SETTINGS_PREFS_BEHAVIOR_JS;
336 path_to_idr_map_[kSettingsPrefsTypesHTMLPath] = IDR_SETTINGS_PREFS_TYPES_HTML; 325 path_to_idr_map_[kSettingsPrefsTypesHTMLPath] = IDR_SETTINGS_PREFS_TYPES_HTML;
337 path_to_idr_map_[kSettingsPrefsTypesJSPath] = IDR_SETTINGS_PREFS_TYPES_JS; 326 path_to_idr_map_[kSettingsPrefsTypesJSPath] = IDR_SETTINGS_PREFS_TYPES_JS;
338 path_to_idr_map_[kOptionsPolymerHTMLPath] = IDR_OPTIONS_POLYMER_ELEMENTS_HTML; 327 path_to_idr_map_[kOptionsPolymerHTMLPath] = IDR_OPTIONS_POLYMER_ELEMENTS_HTML;
339 path_to_idr_map_[kSettingsPrefsHTMLPath] = IDR_SETTINGS_PREFS_HTML;
340 path_to_idr_map_[kSettingsPrefsJSPath] = IDR_SETTINGS_PREFS_JS;
341 path_to_idr_map_[kSettingsI18nHTMLPath] = IDR_OPTIONS_I18N_SETUP_HTML;
342 path_to_idr_map_[kFingerprintBrowserProxyHTMLPath] =
343 IDR_OPTIONS_FINGERPRINT_BROWSER_PROXY_HTML;
344 path_to_idr_map_[kFingerprintBrowserProxyJSPath] =
345 IDR_OPTIONS_FINGERPRINT_BROWSER_PROXY_JS;
346 path_to_idr_map_[kFingerprintProgressArcHTMLPath] =
347 IDR_OPTIONS_FINGERPRINT_PROGRESS_ARC_HTML;
348 path_to_idr_map_[kFingerprintProgressArcJSPath] =
349 IDR_OPTIONS_FINGERPRINT_PROGRESS_ARC_JS;
350 #endif 328 #endif
351 } 329 }
352 330
353 //////////////////////////////////////////////////////////////////////////////// 331 ////////////////////////////////////////////////////////////////////////////////
354 // 332 //
355 // OptionsPageUIHandler 333 // OptionsPageUIHandler
356 // 334 //
357 //////////////////////////////////////////////////////////////////////////////// 335 ////////////////////////////////////////////////////////////////////////////////
358 336
359 OptionsPageUIHandler::OptionsPageUIHandler() { 337 OptionsPageUIHandler::OptionsPageUIHandler() {
(...skipping 269 matching lines...) Expand 10 before | Expand all | Expand 10 after
629 // Add only if handler's service is enabled. 607 // Add only if handler's service is enabled.
630 if (handler->IsEnabled()) { 608 if (handler->IsEnabled()) {
631 // Add handler to the list and also pass the ownership. 609 // Add handler to the list and also pass the ownership.
632 web_ui()->AddMessageHandler(std::move(handler)); 610 web_ui()->AddMessageHandler(std::move(handler));
633 handler_raw->GetLocalizedValues(localized_strings); 611 handler_raw->GetLocalizedValues(localized_strings);
634 handlers_.push_back(handler_raw); 612 handlers_.push_back(handler_raw);
635 } 613 }
636 } 614 }
637 615
638 } // namespace options 616 } // namespace options
OLDNEW
« no previous file with comments | « chrome/browser/ui/webui/options/browser_options_handler.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698