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

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

Issue 2376293005: cros: Tweaked the good/bad pin checking on the js to use the new quick unlock api function. (Closed)
Patch Set: Fixed patch set 1 errors. Created 4 years, 2 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/browser_options_handler.h" 5 #include "chrome/browser/ui/webui/options/browser_options_handler.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include <set> 9 #include <set>
10 #include <utility> 10 #include <utility>
(...skipping 477 matching lines...) Expand 10 before | Expand all | Expand 10 after
488 { "noPointingDevices", IDS_OPTIONS_NO_POINTING_DEVICES }, 488 { "noPointingDevices", IDS_OPTIONS_NO_POINTING_DEVICES },
489 { "confirm", IDS_CONFIRM }, 489 { "confirm", IDS_CONFIRM },
490 { "configurePinChoosePinTitle", 490 { "configurePinChoosePinTitle",
491 IDS_SETTINGS_PEOPLE_CONFIGURE_PIN_CHOOSE_PIN_TITLE }, 491 IDS_SETTINGS_PEOPLE_CONFIGURE_PIN_CHOOSE_PIN_TITLE },
492 { "configurePinConfirmPinTitle", 492 { "configurePinConfirmPinTitle",
493 IDS_SETTINGS_PEOPLE_CONFIGURE_PIN_CONFIRM_PIN_TITLE }, 493 IDS_SETTINGS_PEOPLE_CONFIGURE_PIN_CONFIRM_PIN_TITLE },
494 { "configurePinContinueButton", 494 { "configurePinContinueButton",
495 IDS_SETTINGS_PEOPLE_CONFIGURE_PIN_CONTINUE_BUTTON }, 495 IDS_SETTINGS_PEOPLE_CONFIGURE_PIN_CONTINUE_BUTTON },
496 { "configurePinMismatched", IDS_SETTINGS_PEOPLE_CONFIGURE_PIN_MISMATCHED }, 496 { "configurePinMismatched", IDS_SETTINGS_PEOPLE_CONFIGURE_PIN_MISMATCHED },
497 { "configurePinTooShort", IDS_SETTINGS_PEOPLE_CONFIGURE_PIN_TOO_SHORT} , 497 { "configurePinTooShort", IDS_SETTINGS_PEOPLE_CONFIGURE_PIN_TOO_SHORT} ,
498 { "configurePinTooLong", IDS_SETTINGS_PEOPLE_CONFIGURE_PIN_TOO_LONG} ,
498 { "configurePinWeakPin", IDS_SETTINGS_PEOPLE_CONFIGURE_PIN_WEAK_PIN }, 499 { "configurePinWeakPin", IDS_SETTINGS_PEOPLE_CONFIGURE_PIN_WEAK_PIN },
499 { "lockScreenChangePinButton", 500 { "lockScreenChangePinButton",
500 IDS_SETTINGS_PEOPLE_LOCK_SCREEN_CHANGE_PIN_BUTTON}, 501 IDS_SETTINGS_PEOPLE_LOCK_SCREEN_CHANGE_PIN_BUTTON},
501 { "lockScreenNone", IDS_SETTINGS_PEOPLE_LOCK_SCREEN_NONE }, 502 { "lockScreenNone", IDS_SETTINGS_PEOPLE_LOCK_SCREEN_NONE },
502 { "lockScreenPasswordOnly", IDS_SETTINGS_PEOPLE_LOCK_SCREEN_PASSWORD_ONLY }, 503 { "lockScreenPasswordOnly", IDS_SETTINGS_PEOPLE_LOCK_SCREEN_PASSWORD_ONLY },
503 { "lockScreenPinOrPassword", 504 { "lockScreenPinOrPassword",
504 IDS_SETTINGS_PEOPLE_LOCK_SCREEN_PIN_OR_PASSWORD }, 505 IDS_SETTINGS_PEOPLE_LOCK_SCREEN_PIN_OR_PASSWORD },
505 { "lockScreenSetupPinButton", 506 { "lockScreenSetupPinButton",
506 IDS_SETTINGS_PEOPLE_LOCK_SCREEN_SETUP_PIN_BUTTON }, 507 IDS_SETTINGS_PEOPLE_LOCK_SCREEN_SETUP_PIN_BUTTON },
507 { "lockScreenTitle", IDS_SETTINGS_PEOPLE_LOCK_SCREEN_TITLE }, 508 { "lockScreenTitle", IDS_SETTINGS_PEOPLE_LOCK_SCREEN_TITLE },
(...skipping 1726 matching lines...) Expand 10 before | Expand all | Expand 10 after
2234 2235
2235 bool BrowserOptionsHandler::IsDeviceOwnerProfile() { 2236 bool BrowserOptionsHandler::IsDeviceOwnerProfile() {
2236 #if defined(OS_CHROMEOS) 2237 #if defined(OS_CHROMEOS)
2237 return chromeos::ProfileHelper::IsOwnerProfile(Profile::FromWebUI(web_ui())); 2238 return chromeos::ProfileHelper::IsOwnerProfile(Profile::FromWebUI(web_ui()));
2238 #else 2239 #else
2239 return true; 2240 return true;
2240 #endif 2241 #endif
2241 } 2242 }
2242 2243
2243 } // namespace options 2244 } // namespace options
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698