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

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

Issue 2787153002: MD Settings: Move easy unlock from people to lock screen. (Closed)
Patch Set: Closure. Created 3 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
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 kEasyUnlockBrowserProxyHTMLPath[] =
143 "people_page/easy_unlock_browser_proxy.html";
144 constexpr char kEasyUnlockBrowserProxyJSPath[] =
145 "people_page/easy_unlock_browser_proxy.js";
146 constexpr char kEasyUnlockTurnOffDialogHTMLPath[] =
147 "people_page/easy_unlock_turn_off_dialog.html";
148 constexpr char kEasyUnlockTurnOffDialogJSPath[] =
149 "people_page/easy_unlock_turn_off_dialog.js";
142 constexpr char kFingerprintListHTMLPath[] = "people_page/fingerprint_list.html"; 150 constexpr char kFingerprintListHTMLPath[] = "people_page/fingerprint_list.html";
143 constexpr char kFingerprintListJSPath[] = "people_page/fingerprint_list.js"; 151 constexpr char kFingerprintListJSPath[] = "people_page/fingerprint_list.js";
144 constexpr char kSetupFingerprintHTMLPath[] = 152 constexpr char kSetupFingerprintHTMLPath[] =
145 "people_page/setup_fingerprint_dialog.html"; 153 "people_page/setup_fingerprint_dialog.html";
146 constexpr char kSetupFingerprintJSPath[] = 154 constexpr char kSetupFingerprintJSPath[] =
147 "people_page/setup_fingerprint_dialog.js"; 155 "people_page/setup_fingerprint_dialog.js";
148 constexpr char kFingerprintBrowserProxyHTMLPath[] = 156 constexpr char kFingerprintBrowserProxyHTMLPath[] =
149 "people_page/fingerprint_browser_proxy.html"; 157 "people_page/fingerprint_browser_proxy.html";
150 constexpr char kFingerprintBrowserProxyJSPath[] = 158 constexpr char kFingerprintBrowserProxyJSPath[] =
151 "people_page/fingerprint_browser_proxy.js"; 159 "people_page/fingerprint_browser_proxy.js";
(...skipping 152 matching lines...) Expand 10 before | Expand all | Expand 10 after
304 path_to_idr_map_[kLockScreenConstantsHTMLPath] = 312 path_to_idr_map_[kLockScreenConstantsHTMLPath] =
305 IDR_OPTIONS_LOCK_SCREEN_CONSTANTS_HTML; 313 IDR_OPTIONS_LOCK_SCREEN_CONSTANTS_HTML;
306 path_to_idr_map_[kLockScreenConstantsJSPath] = 314 path_to_idr_map_[kLockScreenConstantsJSPath] =
307 IDR_OPTIONS_LOCK_SCREEN_CONSTANTS_JS; 315 IDR_OPTIONS_LOCK_SCREEN_CONSTANTS_JS;
308 path_to_idr_map_[kLockStateBehaviorHTMLPath] = 316 path_to_idr_map_[kLockStateBehaviorHTMLPath] =
309 IDR_OPTIONS_LOCK_STATE_BEHAVIOR_HTML; 317 IDR_OPTIONS_LOCK_STATE_BEHAVIOR_HTML;
310 path_to_idr_map_[kLockStateBehaviorJSPath] = 318 path_to_idr_map_[kLockStateBehaviorJSPath] =
311 IDR_OPTIONS_LOCK_STATE_BEHAVIOR_JS; 319 IDR_OPTIONS_LOCK_STATE_BEHAVIOR_JS;
312 path_to_idr_map_[kLockScreenHTMLPath] = IDR_OPTIONS_LOCK_SCREEN_HTML; 320 path_to_idr_map_[kLockScreenHTMLPath] = IDR_OPTIONS_LOCK_SCREEN_HTML;
313 path_to_idr_map_[kLockScreenJSPath] = IDR_OPTIONS_LOCK_SCREEN_JS; 321 path_to_idr_map_[kLockScreenJSPath] = IDR_OPTIONS_LOCK_SCREEN_JS;
322 path_to_idr_map_[kEasyUnlockBrowserProxyHTMLPath] =
323 IDR_OPTIONS_EASY_UNLOCK_BROWSER_PROXY_HTML;
324 path_to_idr_map_[kEasyUnlockBrowserProxyJSPath] =
325 IDR_OPTIONS_EASY_UNLOCK_BROWSER_PROXY_JS;
326 path_to_idr_map_[kEasyUnlockTurnOffDialogHTMLPath] =
327 IDR_OPTIONS_EASY_UNLOCK_TURN_OFF_DIALOG_HTML;
328 path_to_idr_map_[kEasyUnlockTurnOffDialogJSPath] =
329 IDR_OPTIONS_EASY_UNLOCK_TURN_OFF_DIALOG_JS;
314 path_to_idr_map_[kSetupPinHTMLPath] = IDR_OPTIONS_SETUP_PIN_DIALOG_HTML; 330 path_to_idr_map_[kSetupPinHTMLPath] = IDR_OPTIONS_SETUP_PIN_DIALOG_HTML;
315 path_to_idr_map_[kSetupPinJSPath] = IDR_OPTIONS_SETUP_PIN_DIALOG_JS; 331 path_to_idr_map_[kSetupPinJSPath] = IDR_OPTIONS_SETUP_PIN_DIALOG_JS;
316 path_to_idr_map_[kFingerprintListHTMLPath] = 332 path_to_idr_map_[kFingerprintListHTMLPath] =
317 IDR_OPTIONS_FINGERPRINT_LIST_HTML; 333 IDR_OPTIONS_FINGERPRINT_LIST_HTML;
318 path_to_idr_map_[kFingerprintListJSPath] = IDR_OPTIONS_FINGERPRINT_LIST_JS; 334 path_to_idr_map_[kFingerprintListJSPath] = IDR_OPTIONS_FINGERPRINT_LIST_JS;
319 path_to_idr_map_[kSetupFingerprintHTMLPath] = 335 path_to_idr_map_[kSetupFingerprintHTMLPath] =
320 IDR_OPTIONS_SETUP_FINGERPRINT_DIALOG_HTML; 336 IDR_OPTIONS_SETUP_FINGERPRINT_DIALOG_HTML;
321 path_to_idr_map_[kSetupFingerprintJSPath] = 337 path_to_idr_map_[kSetupFingerprintJSPath] =
322 IDR_OPTIONS_SETUP_FINGERPRINT_DIALOG_JS; 338 IDR_OPTIONS_SETUP_FINGERPRINT_DIALOG_JS;
323 339
(...skipping 312 matching lines...) Expand 10 before | Expand all | Expand 10 after
636 // Add only if handler's service is enabled. 652 // Add only if handler's service is enabled.
637 if (handler->IsEnabled()) { 653 if (handler->IsEnabled()) {
638 // Add handler to the list and also pass the ownership. 654 // Add handler to the list and also pass the ownership.
639 web_ui()->AddMessageHandler(std::move(handler)); 655 web_ui()->AddMessageHandler(std::move(handler));
640 handler_raw->GetLocalizedValues(localized_strings); 656 handler_raw->GetLocalizedValues(localized_strings);
641 handlers_.push_back(handler_raw); 657 handlers_.push_back(handler_raw);
642 } 658 }
643 } 659 }
644 660
645 } // namespace options 661 } // namespace options
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698