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

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

Issue 2713343003: MD Settings: Add "Auto Open" setting to Downloads page UI. (Closed)
Patch Set: fix merge? Created 3 years, 9 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 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
67 } 67 }
68 } 68 }
69 69
70 void AddCommonStrings(content::WebUIDataSource* html_source, Profile* profile) { 70 void AddCommonStrings(content::WebUIDataSource* html_source, Profile* profile) {
71 LocalizedString localized_strings[] = { 71 LocalizedString localized_strings[] = {
72 {"add", IDS_ADD}, 72 {"add", IDS_ADD},
73 {"advancedPageTitle", IDS_SETTINGS_ADVANCED}, 73 {"advancedPageTitle", IDS_SETTINGS_ADVANCED},
74 {"back", IDS_ACCNAME_BACK}, 74 {"back", IDS_ACCNAME_BACK},
75 {"basicPageTitle", IDS_SETTINGS_BASIC}, 75 {"basicPageTitle", IDS_SETTINGS_BASIC},
76 {"cancel", IDS_CANCEL}, 76 {"cancel", IDS_CANCEL},
77 {"clear", IDS_CLEAR},
77 {"close", IDS_CLOSE}, 78 {"close", IDS_CLOSE},
78 {"confirm", IDS_CONFIRM}, 79 {"confirm", IDS_CONFIRM},
79 {"controlledByExtension", IDS_SETTINGS_CONTROLLED_BY_EXTENSION}, 80 {"controlledByExtension", IDS_SETTINGS_CONTROLLED_BY_EXTENSION},
80 {"disable", IDS_DISABLE}, 81 {"disable", IDS_DISABLE},
81 {"done", IDS_DONE}, 82 {"done", IDS_DONE},
82 {"edit", IDS_SETTINGS_EDIT}, 83 {"edit", IDS_SETTINGS_EDIT},
83 {"learnMore", IDS_LEARN_MORE}, 84 {"learnMore", IDS_LEARN_MORE},
84 {"menuButtonLabel", IDS_SETTINGS_MENU_BUTTON_LABEL}, 85 {"menuButtonLabel", IDS_SETTINGS_MENU_BUTTON_LABEL},
85 {"ok", IDS_OK}, 86 {"ok", IDS_OK},
86 {"restart", IDS_SETTINGS_RESTART}, 87 {"restart", IDS_SETTINGS_RESTART},
(...skipping 602 matching lines...) Expand 10 before | Expand all | Expand 10 after
689 } 690 }
690 #endif 691 #endif
691 692
692 void AddDownloadsStrings(content::WebUIDataSource* html_source) { 693 void AddDownloadsStrings(content::WebUIDataSource* html_source) {
693 LocalizedString localized_strings[] = { 694 LocalizedString localized_strings[] = {
694 {"downloadsPageTitle", IDS_SETTINGS_DOWNLOADS}, 695 {"downloadsPageTitle", IDS_SETTINGS_DOWNLOADS},
695 {"downloadLocation", IDS_SETTINGS_DOWNLOAD_LOCATION}, 696 {"downloadLocation", IDS_SETTINGS_DOWNLOAD_LOCATION},
696 {"changeDownloadLocation", IDS_SETTINGS_CHANGE_DOWNLOAD_LOCATION}, 697 {"changeDownloadLocation", IDS_SETTINGS_CHANGE_DOWNLOAD_LOCATION},
697 {"promptForDownload", IDS_SETTINGS_PROMPT_FOR_DOWNLOAD}, 698 {"promptForDownload", IDS_SETTINGS_PROMPT_FOR_DOWNLOAD},
698 {"disconnectGoogleDriveAccount", IDS_SETTINGS_DISCONNECT_GOOGLE_DRIVE}, 699 {"disconnectGoogleDriveAccount", IDS_SETTINGS_DISCONNECT_GOOGLE_DRIVE},
699 }; 700 {"openFileTypesAutomatically",
701 IDS_SETTINGS_OPEN_FILE_TYPES_AUTOMATICALLY}};
Dan Beam 2017/02/27 05:50:36 is this was clang-format does?
tommycli 2017/02/28 00:47:26 Yep...
700 AddLocalizedStringsBulk(html_source, localized_strings, 702 AddLocalizedStringsBulk(html_source, localized_strings,
701 arraysize(localized_strings)); 703 arraysize(localized_strings));
702 } 704 }
703 705
704 void AddResetStrings(content::WebUIDataSource* html_source) { 706 void AddResetStrings(content::WebUIDataSource* html_source) {
705 LocalizedString localized_strings[] = { 707 LocalizedString localized_strings[] = {
706 {"resetPageTitle", IDS_SETTINGS_RESET}, 708 {"resetPageTitle", IDS_SETTINGS_RESET},
707 {"resetPageDescription", IDS_RESET_PROFILE_SETTINGS_DESCRIPTION}, 709 {"resetPageDescription", IDS_RESET_PROFILE_SETTINGS_DESCRIPTION},
708 {"resetPageExplanation", IDS_RESET_PROFILE_SETTINGS_EXPLANATION}, 710 {"resetPageExplanation", IDS_RESET_PROFILE_SETTINGS_EXPLANATION},
709 {"triggeredResetPageExplanation", 711 {"triggeredResetPageExplanation",
(...skipping 1252 matching lines...) Expand 10 before | Expand all | Expand 10 after
1962 1964
1963 #if defined(OS_CHROMEOS) 1965 #if defined(OS_CHROMEOS)
1964 chromeos::network_element::AddLocalizedStrings(html_source); 1966 chromeos::network_element::AddLocalizedStrings(html_source);
1965 #endif 1967 #endif
1966 policy_indicator::AddLocalizedStrings(html_source); 1968 policy_indicator::AddLocalizedStrings(html_source);
1967 1969
1968 html_source->SetJsonPath(kLocalizedStringsFile); 1970 html_source->SetJsonPath(kLocalizedStringsFile);
1969 } 1971 }
1970 1972
1971 } // namespace settings 1973 } // namespace settings
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698