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

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

Issue 2563143002: MD Settings: About: Fixes to channel switcher dialog (Closed)
Patch Set: Created 4 years 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 219 matching lines...) Expand 10 before | Expand all | Expand 10 after
230 IDS_SETTINGS_ABOUT_PAGE_DELAYED_WARNING_MESSAGE}, 230 IDS_SETTINGS_ABOUT_PAGE_DELAYED_WARNING_MESSAGE},
231 {"aboutDelayedWarningTitle", IDS_SETTINGS_ABOUT_PAGE_DELAYED_WARNING_TITLE}, 231 {"aboutDelayedWarningTitle", IDS_SETTINGS_ABOUT_PAGE_DELAYED_WARNING_TITLE},
232 {"aboutPowerwashWarningMessage", 232 {"aboutPowerwashWarningMessage",
233 IDS_SETTINGS_ABOUT_PAGE_POWERWASH_WARNING_MESSAGE}, 233 IDS_SETTINGS_ABOUT_PAGE_POWERWASH_WARNING_MESSAGE},
234 {"aboutPowerwashWarningTitle", 234 {"aboutPowerwashWarningTitle",
235 IDS_SETTINGS_ABOUT_PAGE_POWERWASH_WARNING_TITLE}, 235 IDS_SETTINGS_ABOUT_PAGE_POWERWASH_WARNING_TITLE},
236 {"aboutUnstableWarningMessage", 236 {"aboutUnstableWarningMessage",
237 IDS_SETTINGS_ABOUT_PAGE_UNSTABLE_WARNING_MESSAGE}, 237 IDS_SETTINGS_ABOUT_PAGE_UNSTABLE_WARNING_MESSAGE},
238 {"aboutUnstableWarningTitle", 238 {"aboutUnstableWarningTitle",
239 IDS_SETTINGS_ABOUT_PAGE_UNSTABLE_WARNING_TITLE}, 239 IDS_SETTINGS_ABOUT_PAGE_UNSTABLE_WARNING_TITLE},
240 {"aboutChannelDialogBeta", IDS_SETTINGS_ABOUT_PAGE_DIALOG_CHANNEL_BETA},
241 {"aboutChannelDialogDev", IDS_SETTINGS_ABOUT_PAGE_DIALOG_CHANNEL_DEV},
242 {"aboutChannelDialogStable", IDS_SETTINGS_ABOUT_PAGE_DIALOG_CHANNEL_STABLE},
240 #endif 243 #endif
241 }; 244 };
242 AddLocalizedStringsBulk(html_source, localized_strings, 245 AddLocalizedStringsBulk(html_source, localized_strings,
243 arraysize(localized_strings)); 246 arraysize(localized_strings));
244 247
245 html_source->AddString( 248 html_source->AddString(
246 "aboutUpgradeUpToDate", 249 "aboutUpgradeUpToDate",
247 #if defined(OS_CHROMEOS) 250 #if defined(OS_CHROMEOS)
248 ash::SubstituteChromeOSDeviceType(IDS_SETTINGS_UPGRADE_UP_TO_DATE)); 251 ash::SubstituteChromeOSDeviceType(IDS_SETTINGS_UPGRADE_UP_TO_DATE));
249 #else 252 #else
(...skipping 1596 matching lines...) Expand 10 before | Expand all | Expand 10 after
1846 #if defined(USE_NSS_CERTS) 1849 #if defined(USE_NSS_CERTS)
1847 AddCertificateManagerStrings(html_source); 1850 AddCertificateManagerStrings(html_source);
1848 #endif 1851 #endif
1849 1852
1850 policy_indicator::AddLocalizedStrings(html_source); 1853 policy_indicator::AddLocalizedStrings(html_source);
1851 1854
1852 html_source->SetJsonPath(kLocalizedStringsFile); 1855 html_source->SetJsonPath(kLocalizedStringsFile);
1853 } 1856 }
1854 1857
1855 } // namespace settings 1858 } // namespace settings
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698