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

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

Issue 2302483003: Pin keyboard improvements. (Closed)
Patch Set: Remove async. Created 4 years, 3 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 466 matching lines...) Expand 10 before | Expand all | Expand 10 after
477 { "factoryResetRestart", IDS_OPTIONS_FACTORY_RESET_BUTTON }, 477 { "factoryResetRestart", IDS_OPTIONS_FACTORY_RESET_BUTTON },
478 { "factoryResetTitle", IDS_OPTIONS_FACTORY_RESET }, 478 { "factoryResetTitle", IDS_OPTIONS_FACTORY_RESET },
479 { "factoryResetWarning", IDS_OPTIONS_FACTORY_RESET_WARNING }, 479 { "factoryResetWarning", IDS_OPTIONS_FACTORY_RESET_WARNING },
480 { "internetOptionsButtonTitle", IDS_OPTIONS_INTERNET_OPTIONS_BUTTON_TITLE }, 480 { "internetOptionsButtonTitle", IDS_OPTIONS_INTERNET_OPTIONS_BUTTON_TITLE },
481 { "keyboardSettingsButtonTitle", 481 { "keyboardSettingsButtonTitle",
482 IDS_OPTIONS_DEVICE_GROUP_KEYBOARD_SETTINGS_BUTTON_TITLE }, 482 IDS_OPTIONS_DEVICE_GROUP_KEYBOARD_SETTINGS_BUTTON_TITLE },
483 { "manageAccountsButtonTitle", IDS_OPTIONS_ACCOUNTS_BUTTON_TITLE }, 483 { "manageAccountsButtonTitle", IDS_OPTIONS_ACCOUNTS_BUTTON_TITLE },
484 { "mouseSpeed", IDS_OPTIONS_SETTINGS_MOUSE_SPEED_DESCRIPTION }, 484 { "mouseSpeed", IDS_OPTIONS_SETTINGS_MOUSE_SPEED_DESCRIPTION },
485 { "noPointingDevices", IDS_OPTIONS_NO_POINTING_DEVICES }, 485 { "noPointingDevices", IDS_OPTIONS_NO_POINTING_DEVICES },
486 { "confirm", IDS_CONFIRM }, 486 { "confirm", IDS_CONFIRM },
487 { "pinKeyboardClear", IDS_PIN_KEYBOARD_CLEAR },
488 { "configurePinChoosePinTitle", 487 { "configurePinChoosePinTitle",
489 IDS_SETTINGS_PEOPLE_CONFIGURE_PIN_CHOOSE_PIN_TITLE }, 488 IDS_SETTINGS_PEOPLE_CONFIGURE_PIN_CHOOSE_PIN_TITLE },
490 { "configurePinConfirmPinTitle", 489 { "configurePinConfirmPinTitle",
491 IDS_SETTINGS_PEOPLE_CONFIGURE_PIN_CONFIRM_PIN_TITLE }, 490 IDS_SETTINGS_PEOPLE_CONFIGURE_PIN_CONFIRM_PIN_TITLE },
492 { "configurePinContinueButton", 491 { "configurePinContinueButton",
493 IDS_SETTINGS_PEOPLE_CONFIGURE_PIN_CONTINUE_BUTTON }, 492 IDS_SETTINGS_PEOPLE_CONFIGURE_PIN_CONTINUE_BUTTON },
494 { "configurePinMismatched", IDS_SETTINGS_PEOPLE_CONFIGURE_PIN_MISMATCHED }, 493 { "configurePinMismatched", IDS_SETTINGS_PEOPLE_CONFIGURE_PIN_MISMATCHED },
495 { "configurePinTooShort", IDS_SETTINGS_PEOPLE_CONFIGURE_PIN_TOO_SHORT} , 494 { "configurePinTooShort", IDS_SETTINGS_PEOPLE_CONFIGURE_PIN_TOO_SHORT} ,
496 { "configurePinWeakPin", IDS_SETTINGS_PEOPLE_CONFIGURE_PIN_WEAK_PIN }, 495 { "configurePinWeakPin", IDS_SETTINGS_PEOPLE_CONFIGURE_PIN_WEAK_PIN },
497 { "lockScreenChangePinButton", 496 { "lockScreenChangePinButton",
(...skipping 1734 matching lines...) Expand 10 before | Expand all | Expand 10 after
2232 2231
2233 bool BrowserOptionsHandler::IsDeviceOwnerProfile() { 2232 bool BrowserOptionsHandler::IsDeviceOwnerProfile() {
2234 #if defined(OS_CHROMEOS) 2233 #if defined(OS_CHROMEOS)
2235 return chromeos::ProfileHelper::IsOwnerProfile(Profile::FromWebUI(web_ui())); 2234 return chromeos::ProfileHelper::IsOwnerProfile(Profile::FromWebUI(web_ui()));
2236 #else 2235 #else
2237 return true; 2236 return true;
2238 #endif 2237 #endif
2239 } 2238 }
2240 2239
2241 } // namespace options 2240 } // namespace options
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698