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

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

Issue 2808973002: Additional CL to Issue 2795603002 (Closed)
Patch Set: Created 3 years, 8 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 | « no previous file | 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/i18n/number_formatting.h" 10 #include "base/i18n/number_formatting.h"
(...skipping 258 matching lines...) Expand 10 before | Expand all | Expand 10 after
269 {"aboutChannelDialogBeta", IDS_SETTINGS_ABOUT_PAGE_DIALOG_CHANNEL_BETA}, 269 {"aboutChannelDialogBeta", IDS_SETTINGS_ABOUT_PAGE_DIALOG_CHANNEL_BETA},
270 {"aboutChannelDialogDev", IDS_SETTINGS_ABOUT_PAGE_DIALOG_CHANNEL_DEV}, 270 {"aboutChannelDialogDev", IDS_SETTINGS_ABOUT_PAGE_DIALOG_CHANNEL_DEV},
271 {"aboutChannelDialogStable", IDS_SETTINGS_ABOUT_PAGE_DIALOG_CHANNEL_STABLE}, 271 {"aboutChannelDialogStable", IDS_SETTINGS_ABOUT_PAGE_DIALOG_CHANNEL_STABLE},
272 272
273 // About page, update warning dialog. 273 // About page, update warning dialog.
274 {"aboutUpdateWarningMessage", 274 {"aboutUpdateWarningMessage",
275 IDS_SETTINGS_ABOUT_PAGE_UPDATE_WARNING_MESSAGE}, 275 IDS_SETTINGS_ABOUT_PAGE_UPDATE_WARNING_MESSAGE},
276 {"aboutUpdateWarningTitle", IDS_SETTINGS_ABOUT_PAGE_UPDATE_WARNING_TITLE}, 276 {"aboutUpdateWarningTitle", IDS_SETTINGS_ABOUT_PAGE_UPDATE_WARNING_TITLE},
277 {"aboutUpdateWarningContinue", 277 {"aboutUpdateWarningContinue",
278 IDS_SETTINGS_ABOUT_PAGE_UPDATE_WARNING_CONTINUE_BUTTON}, 278 IDS_SETTINGS_ABOUT_PAGE_UPDATE_WARNING_CONTINUE_BUTTON},
279 #endif 279 #endif // defined(OS_CHROMEOS)
280 }; 280 };
281 AddLocalizedStringsBulk(html_source, localized_strings, 281 AddLocalizedStringsBulk(html_source, localized_strings,
282 arraysize(localized_strings)); 282 arraysize(localized_strings));
283 283
284 html_source->AddString( 284 html_source->AddString(
285 "aboutUpgradeUpToDate", 285 "aboutUpgradeUpToDate",
286 #if defined(OS_CHROMEOS) 286 #if defined(OS_CHROMEOS)
287 ash::SubstituteChromeOSDeviceType(IDS_SETTINGS_UPGRADE_UP_TO_DATE)); 287 ash::SubstituteChromeOSDeviceType(IDS_SETTINGS_UPGRADE_UP_TO_DATE));
288 #else 288 #else
289 l10n_util::GetStringUTF16(IDS_SETTINGS_UPGRADE_UP_TO_DATE)); 289 l10n_util::GetStringUTF16(IDS_SETTINGS_UPGRADE_UP_TO_DATE));
(...skipping 1748 matching lines...) Expand 10 before | Expand all | Expand 10 after
2038 2038
2039 #if defined(OS_CHROMEOS) 2039 #if defined(OS_CHROMEOS)
2040 chromeos::network_element::AddLocalizedStrings(html_source); 2040 chromeos::network_element::AddLocalizedStrings(html_source);
2041 #endif 2041 #endif
2042 policy_indicator::AddLocalizedStrings(html_source); 2042 policy_indicator::AddLocalizedStrings(html_source);
2043 2043
2044 html_source->SetJsonPath(kLocalizedStringsFile); 2044 html_source->SetJsonPath(kLocalizedStringsFile);
2045 } 2045 }
2046 2046
2047 } // namespace settings 2047 } // namespace settings
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698