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

Side by Side Diff: chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc

Issue 2258553004: Add pref to enable/disable palette tray. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@lkgr
Patch Set: Rebase 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 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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/settings/md_settings_localized_strings_provide r.h" 5 #include "chrome/browser/ui/webui/settings/md_settings_localized_strings_provide r.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/i18n/number_formatting.h" 10 #include "base/i18n/number_formatting.h"
(...skipping 508 matching lines...) Expand 10 before | Expand all | Expand 10 after
519 {"keyRepeatRateFast", IDS_SETTINGS_KEYBOARD_AUTO_REPEAT_FAST}, 519 {"keyRepeatRateFast", IDS_SETTINGS_KEYBOARD_AUTO_REPEAT_FAST},
520 {"showKeyboardShortcutsOverlay", 520 {"showKeyboardShortcutsOverlay",
521 IDS_SETTINGS_KEYBOARD_SHOW_KEYBOARD_SHORTCUTS_OVERLAY}, 521 IDS_SETTINGS_KEYBOARD_SHOW_KEYBOARD_SHORTCUTS_OVERLAY},
522 {"keyboardShowLanguageAndInput", 522 {"keyboardShowLanguageAndInput",
523 IDS_SETTINGS_KEYBOARD_SHOW_LANGUAGE_AND_INPUT}, 523 IDS_SETTINGS_KEYBOARD_SHOW_LANGUAGE_AND_INPUT},
524 }; 524 };
525 AddLocalizedStringsBulk(html_source, keyboard_strings, 525 AddLocalizedStringsBulk(html_source, keyboard_strings,
526 arraysize(keyboard_strings)); 526 arraysize(keyboard_strings));
527 527
528 LocalizedString stylus_strings[] = { 528 LocalizedString stylus_strings[] = {
529 {"stylusTitle", IDS_SETTINGS_STYLUS_TITLE}, 529 {"stylusTitle", IDS_SETTINGS_STYLUS_TITLE},
530 {"stylusAutoOpenStylusTools", IDS_SETTINGS_STYLUS_AUTO_OPEN_STYLUS_TOOLS}, 530 {"stylusEnableStylusTools", IDS_SETTINGS_STYLUS_ENABLE_STYLUS_TOOLS},
531 {"stylusFindMoreApps", IDS_SETTINGS_STYLUS_FIND_MORE_APPS} 531 {"stylusAutoOpenStylusTools", IDS_SETTINGS_STYLUS_AUTO_OPEN_STYLUS_TOOLS},
532 }; 532 {"stylusFindMoreApps", IDS_SETTINGS_STYLUS_FIND_MORE_APPS}};
533 AddLocalizedStringsBulk(html_source, stylus_strings, 533 AddLocalizedStringsBulk(html_source, stylus_strings,
534 arraysize(stylus_strings)); 534 arraysize(stylus_strings));
535 535
536
537 LocalizedString display_strings[] = { 536 LocalizedString display_strings[] = {
538 {"displayTitle", IDS_SETTINGS_DISPLAY_TITLE}, 537 {"displayTitle", IDS_SETTINGS_DISPLAY_TITLE},
539 {"displayArrangement", IDS_SETTINGS_DISPLAY_ARRANGEMENT}, 538 {"displayArrangement", IDS_SETTINGS_DISPLAY_ARRANGEMENT},
540 {"displayMirror", IDS_SETTINGS_DISPLAY_MIRROR}, 539 {"displayMirror", IDS_SETTINGS_DISPLAY_MIRROR},
541 {"displayMakePrimary", IDS_SETTINGS_DISPLAY_MAKE_PRIMARY}, 540 {"displayMakePrimary", IDS_SETTINGS_DISPLAY_MAKE_PRIMARY},
542 {"displayResolutionTitle", IDS_SETTINGS_DISPLAY_RESOLUTION_TITLE}, 541 {"displayResolutionTitle", IDS_SETTINGS_DISPLAY_RESOLUTION_TITLE},
543 {"displayResolutionText", IDS_SETTINGS_DISPLAY_RESOLUTION_TEXT}, 542 {"displayResolutionText", IDS_SETTINGS_DISPLAY_RESOLUTION_TEXT},
544 {"displayResolutionTextBest", IDS_SETTINGS_DISPLAY_RESOLUTION_TEXT_BEST}, 543 {"displayResolutionTextBest", IDS_SETTINGS_DISPLAY_RESOLUTION_TEXT_BEST},
545 {"displayResolutionTextNative", 544 {"displayResolutionTextNative",
546 IDS_SETTINGS_DISPLAY_RESOLUTION_TEXT_NATIVE}, 545 IDS_SETTINGS_DISPLAY_RESOLUTION_TEXT_NATIVE},
(...skipping 887 matching lines...) Expand 10 before | Expand all | Expand 10 after
1434 #endif 1433 #endif
1435 AddUsersStrings(html_source); 1434 AddUsersStrings(html_source);
1436 AddWebContentStrings(html_source); 1435 AddWebContentStrings(html_source);
1437 1436
1438 policy_indicator::AddLocalizedStrings(html_source); 1437 policy_indicator::AddLocalizedStrings(html_source);
1439 1438
1440 html_source->SetJsonPath(kLocalizedStringsFile); 1439 html_source->SetJsonPath(kLocalizedStringsFile);
1441 } 1440 }
1442 1441
1443 } // namespace settings 1442 } // namespace settings
OLDNEW
« no previous file with comments | « chrome/browser/ui/webui/options/chromeos/options_stylus_handler.cc ('k') | chrome/browser/ui/webui/settings/md_settings_ui.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698