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

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

Issue 1989723002: MD Settings: About page, adding strings related to updating. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Addressing comment. Created 4 years, 7 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
« no previous file with comments | « chrome/app/settings_strings.grdp ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/strings/utf_string_conversions.h" 10 #include "base/strings/utf_string_conversions.h"
(...skipping 121 matching lines...) Expand 10 before | Expand all | Expand 10 after
132 {"aboutProductTitle", IDS_PRODUCT_OS_NAME}, 132 {"aboutProductTitle", IDS_PRODUCT_OS_NAME},
133 #else 133 #else
134 {"aboutProductTitle", IDS_PRODUCT_NAME}, 134 {"aboutProductTitle", IDS_PRODUCT_NAME},
135 #endif 135 #endif
136 {"aboutGetHelpUsingChrome", IDS_SETTINGS_GET_HELP_USING_CHROME}, 136 {"aboutGetHelpUsingChrome", IDS_SETTINGS_GET_HELP_USING_CHROME},
137 137
138 #if defined(GOOGLE_CHROME_BUILD) 138 #if defined(GOOGLE_CHROME_BUILD)
139 {"aboutReportAnIssue", IDS_SETTINGS_ABOUT_PAGE_REPORT_AN_ISSUE}, 139 {"aboutReportAnIssue", IDS_SETTINGS_ABOUT_PAGE_REPORT_AN_ISSUE},
140 #endif 140 #endif
141 141
142 {"aboutUpgradeCheckStarted", IDS_SETTINGS_ABOUT_UPGRADE_CHECK_STARTED},
143 {"aboutUpgradeRelaunch", IDS_SETTINGS_UPGRADE_SUCCESSFUL_RELAUNCH},
144 {"aboutUpgradeUpdating", IDS_SETTINGS_UPGRADE_UPDATING},
145
142 #if defined(OS_CHROMEOS) 146 #if defined(OS_CHROMEOS)
143 {"aboutChannelStable", IDS_SETTINGS_ABOUT_PAGE_CURRENT_CHANNEL_STABLE}, 147 {"aboutChannelStable", IDS_SETTINGS_ABOUT_PAGE_CURRENT_CHANNEL_STABLE},
144 {"aboutChannelBeta", IDS_SETTINGS_ABOUT_PAGE_CURRENT_CHANNEL_BETA}, 148 {"aboutChannelBeta", IDS_SETTINGS_ABOUT_PAGE_CURRENT_CHANNEL_BETA},
145 {"aboutChannelDev", IDS_SETTINGS_ABOUT_PAGE_CURRENT_CHANNEL_DEV}, 149 {"aboutChannelDev", IDS_SETTINGS_ABOUT_PAGE_CURRENT_CHANNEL_DEV},
146 {"aboutCurrentlyOnChannel", IDS_SETTINGS_ABOUT_PAGE_CURRENT_CHANNEL}, 150 {"aboutCurrentlyOnChannel", IDS_SETTINGS_ABOUT_PAGE_CURRENT_CHANNEL},
151 {"aboutUpgradeUpdatingChannelSwitch",
152 IDS_SETTINGS_UPGRADE_UPDATING_CHANNEL_SWITCH},
153 {"aboutUpgradeSuccessChannelSwitch",
154 IDS_SETTINGS_UPGRADE_SUCCESSFUL_CHANNEL_SWITCH},
147 #endif 155 #endif
148 156
149 }; 157 };
150 AddLocalizedStringsBulk(html_source, localized_strings, 158 AddLocalizedStringsBulk(html_source, localized_strings,
151 arraysize(localized_strings)); 159 arraysize(localized_strings));
160
161 html_source->AddString(
162 "aboutUpgradeUpToDate",
163 #if defined(OS_CHROMEOS)
164 ash::SubstituteChromeOSDeviceType(IDS_SETTINGS_UPGRADE_UP_TO_DATE));
165 #else
166 l10n_util::GetStringUTF16(IDS_SETTINGS_UPGRADE_UP_TO_DATE));
167 #endif
152 } 168 }
153 169
154 #if defined(OS_CHROMEOS) 170 #if defined(OS_CHROMEOS)
155 void AddAccountUITweaksStrings(content::WebUIDataSource* html_source, 171 void AddAccountUITweaksStrings(content::WebUIDataSource* html_source,
156 Profile* profile) { 172 Profile* profile) {
157 base::DictionaryValue localized_values; 173 base::DictionaryValue localized_values;
158 chromeos::AddAccountUITweaksLocalizedValues(&localized_values, profile); 174 chromeos::AddAccountUITweaksLocalizedValues(&localized_values, profile);
159 html_source->AddLocalizedStrings(localized_values); 175 html_source->AddLocalizedStrings(localized_values);
160 } 176 }
161 #endif 177 #endif
(...skipping 849 matching lines...) Expand 10 before | Expand all | Expand 10 after
1011 #endif 1027 #endif
1012 AddUsersStrings(html_source); 1028 AddUsersStrings(html_source);
1013 AddWebContentStrings(html_source); 1029 AddWebContentStrings(html_source);
1014 1030
1015 policy_indicator::AddLocalizedStrings(html_source); 1031 policy_indicator::AddLocalizedStrings(html_source);
1016 1032
1017 html_source->SetJsonPath(kLocalizedStringsFile); 1033 html_source->SetJsonPath(kLocalizedStringsFile);
1018 } 1034 }
1019 1035
1020 } // namespace settings 1036 } // namespace settings
OLDNEW
« no previous file with comments | « chrome/app/settings_strings.grdp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698