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

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

Issue 2538303002: md-settings: Added settings for fingerprint unlock. (Closed)
Patch Set: Rebased. Created 3 years, 10 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
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 121 matching lines...) Expand 10 before | Expand all | Expand 10 after
132 constexpr char kLockScreenConstantsJSPath[] = 132 constexpr char kLockScreenConstantsJSPath[] =
133 "people_page/lock_screen_constants.js"; 133 "people_page/lock_screen_constants.js";
134 constexpr char kLockStateBehaviorHTMLPath[] = 134 constexpr char kLockStateBehaviorHTMLPath[] =
135 "people_page/lock_state_behavior.html"; 135 "people_page/lock_state_behavior.html";
136 constexpr char kLockStateBehaviorJSPath[] = 136 constexpr char kLockStateBehaviorJSPath[] =
137 "people_page/lock_state_behavior.js"; 137 "people_page/lock_state_behavior.js";
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";
143 constexpr char kFingerprintListJSPath[] = "people_page/fingerprint_list.js";
142 constexpr char kSettingsRouteHTMLPath[] = "route.html"; 144 constexpr char kSettingsRouteHTMLPath[] = "route.html";
143 constexpr char kSettingsRouteJSPath[] = "route.js"; 145 constexpr char kSettingsRouteJSPath[] = "route.js";
144 constexpr char kSettingsSharedCSSHTMLPath[] = "settings_shared_css.html"; 146 constexpr char kSettingsSharedCSSHTMLPath[] = "settings_shared_css.html";
145 constexpr char kSettingsBooleanControlBehaviorHTMLPath[] = 147 constexpr char kSettingsBooleanControlBehaviorHTMLPath[] =
146 "controls/settings_boolean_control_behavior.html"; 148 "controls/settings_boolean_control_behavior.html";
147 constexpr char kSettingsBooleanControlBehaviorJSPath[] = 149 constexpr char kSettingsBooleanControlBehaviorJSPath[] =
148 "controls/settings_boolean_control_behavior.js"; 150 "controls/settings_boolean_control_behavior.js";
149 constexpr char kSettingsPrefControlBehaviorHTMLPath[] = 151 constexpr char kSettingsPrefControlBehaviorHTMLPath[] =
150 "controls/pref_control_behavior.html"; 152 "controls/pref_control_behavior.html";
151 constexpr char kSettingsPrefControlBehaviorJSPath[] = 153 constexpr char kSettingsPrefControlBehaviorJSPath[] =
(...skipping 110 matching lines...) Expand 10 before | Expand all | Expand 10 after
262 264
263 bool OptionsUIHTMLSource::ShouldDenyXFrameOptions() const { 265 bool OptionsUIHTMLSource::ShouldDenyXFrameOptions() const {
264 return false; 266 return false;
265 } 267 }
266 268
267 OptionsUIHTMLSource::~OptionsUIHTMLSource() {} 269 OptionsUIHTMLSource::~OptionsUIHTMLSource() {}
268 270
269 void OptionsUIHTMLSource::CreateDataSourceMap() { 271 void OptionsUIHTMLSource::CreateDataSourceMap() {
270 #if defined(OS_CHROMEOS) 272 #if defined(OS_CHROMEOS)
271 path_to_idr_map_[kIconsHTMLPath] = IDR_OPTIONS_ICONS_HTML; 273 path_to_idr_map_[kIconsHTMLPath] = IDR_OPTIONS_ICONS_HTML;
274
275 // These are part of the LockScreen UI.
272 path_to_idr_map_[kPinKeyboardHTMLPath] = IDR_OPTIONS_PIN_KEYBOARD_HTML; 276 path_to_idr_map_[kPinKeyboardHTMLPath] = IDR_OPTIONS_PIN_KEYBOARD_HTML;
273 path_to_idr_map_[kPinKeyboardJSPath] = IDR_OPTIONS_PIN_KEYBOARD_JS; 277 path_to_idr_map_[kPinKeyboardJSPath] = IDR_OPTIONS_PIN_KEYBOARD_JS;
274 path_to_idr_map_[kPasswordPromptDialogHTMLPath] = 278 path_to_idr_map_[kPasswordPromptDialogHTMLPath] =
275 IDR_OPTIONS_PASSWORD_PROMPT_DIALOG_HTML; 279 IDR_OPTIONS_PASSWORD_PROMPT_DIALOG_HTML;
276 path_to_idr_map_[kPasswordPromptDialogJSPath] = 280 path_to_idr_map_[kPasswordPromptDialogJSPath] =
277 IDR_OPTIONS_PASSWORD_PROMPT_DIALOG_JS; 281 IDR_OPTIONS_PASSWORD_PROMPT_DIALOG_JS;
278 path_to_idr_map_[kLockScreenConstantsHTMLPath] = 282 path_to_idr_map_[kLockScreenConstantsHTMLPath] =
279 IDR_OPTIONS_LOCK_SCREEN_CONSTANTS_HTML; 283 IDR_OPTIONS_LOCK_SCREEN_CONSTANTS_HTML;
280 path_to_idr_map_[kLockScreenConstantsJSPath] = 284 path_to_idr_map_[kLockScreenConstantsJSPath] =
281 IDR_OPTIONS_LOCK_SCREEN_CONSTANTS_JS; 285 IDR_OPTIONS_LOCK_SCREEN_CONSTANTS_JS;
282 path_to_idr_map_[kLockStateBehaviorHTMLPath] = 286 path_to_idr_map_[kLockStateBehaviorHTMLPath] =
283 IDR_OPTIONS_LOCK_STATE_BEHAVIOR_HTML; 287 IDR_OPTIONS_LOCK_STATE_BEHAVIOR_HTML;
284 path_to_idr_map_[kLockStateBehaviorJSPath] = 288 path_to_idr_map_[kLockStateBehaviorJSPath] =
285 IDR_OPTIONS_LOCK_STATE_BEHAVIOR_JS; 289 IDR_OPTIONS_LOCK_STATE_BEHAVIOR_JS;
286 path_to_idr_map_[kLockScreenHTMLPath] = IDR_OPTIONS_LOCK_SCREEN_HTML; 290 path_to_idr_map_[kLockScreenHTMLPath] = IDR_OPTIONS_LOCK_SCREEN_HTML;
287 path_to_idr_map_[kLockScreenJSPath] = IDR_OPTIONS_LOCK_SCREEN_JS; 291 path_to_idr_map_[kLockScreenJSPath] = IDR_OPTIONS_LOCK_SCREEN_JS;
288 path_to_idr_map_[kSetupPinHTMLPath] = IDR_OPTIONS_SETUP_PIN_DIALOG_HTML; 292 path_to_idr_map_[kSetupPinHTMLPath] = IDR_OPTIONS_SETUP_PIN_DIALOG_HTML;
289 path_to_idr_map_[kSetupPinJSPath] = IDR_OPTIONS_SETUP_PIN_DIALOG_JS; 293 path_to_idr_map_[kSetupPinJSPath] = IDR_OPTIONS_SETUP_PIN_DIALOG_JS;
294 path_to_idr_map_[kFingerprintListHTMLPath] =
295 IDR_OPTIONS_FINGERPRINT_LIST_HTML;
296 path_to_idr_map_[kFingerprintListJSPath] = IDR_OPTIONS_FINGERPRINT_LIST_JS;
297
290 path_to_idr_map_[kSettingsRouteHTMLPath] = IDR_OPTIONS_ROUTE_HTML; 298 path_to_idr_map_[kSettingsRouteHTMLPath] = IDR_OPTIONS_ROUTE_HTML;
291 path_to_idr_map_[kSettingsRouteJSPath] = IDR_OPTIONS_ROUTE_JS; 299 path_to_idr_map_[kSettingsRouteJSPath] = IDR_OPTIONS_ROUTE_JS;
292 path_to_idr_map_[kSettingsSharedCSSHTMLPath] = IDR_SETTINGS_SHARED_CSS_HTML; 300 path_to_idr_map_[kSettingsSharedCSSHTMLPath] = IDR_SETTINGS_SHARED_CSS_HTML;
293 path_to_idr_map_[kSettingsBooleanControlBehaviorHTMLPath] = 301 path_to_idr_map_[kSettingsBooleanControlBehaviorHTMLPath] =
294 IDR_SETTINGS_BOOLEAN_CONTROL_BEHAVIOR_HTML; 302 IDR_SETTINGS_BOOLEAN_CONTROL_BEHAVIOR_HTML;
295 path_to_idr_map_[kSettingsBooleanControlBehaviorJSPath] = 303 path_to_idr_map_[kSettingsBooleanControlBehaviorJSPath] =
296 IDR_SETTINGS_BOOLEAN_CONTROL_BEHAVIOR_JS; 304 IDR_SETTINGS_BOOLEAN_CONTROL_BEHAVIOR_JS;
297 path_to_idr_map_[kSettingsPrefControlBehaviorHTMLPath] = 305 path_to_idr_map_[kSettingsPrefControlBehaviorHTMLPath] =
298 IDR_SETTINGS_PREF_CONTROL_BEHAVIOR_HTML; 306 IDR_SETTINGS_PREF_CONTROL_BEHAVIOR_HTML;
299 path_to_idr_map_[kSettingsPrefControlBehaviorJSPath] = 307 path_to_idr_map_[kSettingsPrefControlBehaviorJSPath] =
(...skipping 291 matching lines...) Expand 10 before | Expand all | Expand 10 after
591 // Add only if handler's service is enabled. 599 // Add only if handler's service is enabled.
592 if (handler->IsEnabled()) { 600 if (handler->IsEnabled()) {
593 // Add handler to the list and also pass the ownership. 601 // Add handler to the list and also pass the ownership.
594 web_ui()->AddMessageHandler(std::move(handler)); 602 web_ui()->AddMessageHandler(std::move(handler));
595 handler_raw->GetLocalizedValues(localized_strings); 603 handler_raw->GetLocalizedValues(localized_strings);
596 handlers_.push_back(handler_raw); 604 handlers_.push_back(handler_raw);
597 } 605 }
598 } 606 }
599 607
600 } // namespace options 608 } // namespace options
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698