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

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

Issue 2630623002: cros: Allow user to configure note taking app in md-settings. (Closed)
Patch Set: Address comments 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 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 566 matching lines...) Expand 10 before | Expand all | Expand 10 after
577 {"keyboardShowLanguageAndInput", 577 {"keyboardShowLanguageAndInput",
578 IDS_SETTINGS_KEYBOARD_SHOW_LANGUAGE_AND_INPUT}, 578 IDS_SETTINGS_KEYBOARD_SHOW_LANGUAGE_AND_INPUT},
579 }; 579 };
580 AddLocalizedStringsBulk(html_source, keyboard_strings, 580 AddLocalizedStringsBulk(html_source, keyboard_strings,
581 arraysize(keyboard_strings)); 581 arraysize(keyboard_strings));
582 582
583 LocalizedString stylus_strings[] = { 583 LocalizedString stylus_strings[] = {
584 {"stylusTitle", IDS_SETTINGS_STYLUS_TITLE}, 584 {"stylusTitle", IDS_SETTINGS_STYLUS_TITLE},
585 {"stylusEnableStylusTools", IDS_SETTINGS_STYLUS_ENABLE_STYLUS_TOOLS}, 585 {"stylusEnableStylusTools", IDS_SETTINGS_STYLUS_ENABLE_STYLUS_TOOLS},
586 {"stylusAutoOpenStylusTools", IDS_SETTINGS_STYLUS_AUTO_OPEN_STYLUS_TOOLS}, 586 {"stylusAutoOpenStylusTools", IDS_SETTINGS_STYLUS_AUTO_OPEN_STYLUS_TOOLS},
587 {"stylusFindMoreApps", IDS_SETTINGS_STYLUS_FIND_MORE_APPS}}; 587 {"stylusFindMoreAppsPrimary", IDS_SETTINGS_STYLUS_FIND_MORE_APPS_PRIMARY},
588 {"stylusFindMoreAppsSecondary",
589 IDS_SETTINGS_STYLUS_FIND_MORE_APPS_SECONDARY},
590 {"stylusNoteTakingApp", IDS_SETTINGS_STYLUS_NOTE_TAKING_APP_LABEL},
591 {"stylusNoteTakingAppNoneAvailable",
592 IDS_SETTINGS_STYLUS_NOTE_TAKING_APP_NONE_AVAILABLE},
593 {"stylusNoteTakingAppWaitingForAndroid",
594 IDS_SETTINGS_STYLUS_NOTE_TAKING_APP_WAITING_FOR_ANDROID}};
588 AddLocalizedStringsBulk(html_source, stylus_strings, 595 AddLocalizedStringsBulk(html_source, stylus_strings,
589 arraysize(stylus_strings)); 596 arraysize(stylus_strings));
590 597
591 LocalizedString display_strings[] = { 598 LocalizedString display_strings[] = {
592 {"displayTitle", IDS_SETTINGS_DISPLAY_TITLE}, 599 {"displayTitle", IDS_SETTINGS_DISPLAY_TITLE},
593 {"displayArrangementText", IDS_SETTINGS_DISPLAY_ARRANGEMENT_TEXT}, 600 {"displayArrangementText", IDS_SETTINGS_DISPLAY_ARRANGEMENT_TEXT},
594 {"displayArrangementTitle", IDS_SETTINGS_DISPLAY_ARRANGEMENT_TITLE}, 601 {"displayArrangementTitle", IDS_SETTINGS_DISPLAY_ARRANGEMENT_TITLE},
595 {"displayMirror", IDS_SETTINGS_DISPLAY_MIRROR}, 602 {"displayMirror", IDS_SETTINGS_DISPLAY_MIRROR},
596 {"displayMirrorOff", IDS_SETTINGS_DISPLAY_MIRRORING_OFF}, 603 {"displayMirrorOff", IDS_SETTINGS_DISPLAY_MIRRORING_OFF},
597 {"displayMirrorOn", IDS_SETTINGS_DISPLAY_MIRRORING_ON}, 604 {"displayMirrorOn", IDS_SETTINGS_DISPLAY_MIRRORING_ON},
(...skipping 1291 matching lines...) Expand 10 before | Expand all | Expand 10 after
1889 1896
1890 #if defined(OS_CHROMEOS) 1897 #if defined(OS_CHROMEOS)
1891 chromeos::network_element::AddLocalizedStrings(html_source); 1898 chromeos::network_element::AddLocalizedStrings(html_source);
1892 #endif 1899 #endif
1893 policy_indicator::AddLocalizedStrings(html_source); 1900 policy_indicator::AddLocalizedStrings(html_source);
1894 1901
1895 html_source->SetJsonPath(kLocalizedStringsFile); 1902 html_source->SetJsonPath(kLocalizedStringsFile);
1896 } 1903 }
1897 1904
1898 } // namespace settings 1905 } // namespace settings
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698