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

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

Issue 2010653003: MD Settings: About page, implementing channel switcher dialog. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Cleanup Created 4 years, 6 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/strings/utf_string_conversions.h" 10 #include "base/strings/utf_string_conversions.h"
(...skipping 138 matching lines...) Expand 10 before | Expand all | Expand 10 after
149 {"aboutChannelBeta", IDS_SETTINGS_ABOUT_PAGE_CURRENT_CHANNEL_BETA}, 149 {"aboutChannelBeta", IDS_SETTINGS_ABOUT_PAGE_CURRENT_CHANNEL_BETA},
150 {"aboutChannelDev", IDS_SETTINGS_ABOUT_PAGE_CURRENT_CHANNEL_DEV}, 150 {"aboutChannelDev", IDS_SETTINGS_ABOUT_PAGE_CURRENT_CHANNEL_DEV},
151 {"aboutCheckForUpdates", IDS_SETTINGS_ABOUT_PAGE_CHECK_FOR_UPDATES}, 151 {"aboutCheckForUpdates", IDS_SETTINGS_ABOUT_PAGE_CHECK_FOR_UPDATES},
152 {"aboutCurrentlyOnChannel", IDS_SETTINGS_ABOUT_PAGE_CURRENT_CHANNEL}, 152 {"aboutCurrentlyOnChannel", IDS_SETTINGS_ABOUT_PAGE_CURRENT_CHANNEL},
153 {"aboutRelaunchAndPowerwash", 153 {"aboutRelaunchAndPowerwash",
154 IDS_SETTINGS_ABOUT_PAGE_RELAUNCH_AND_POWERWASH}, 154 IDS_SETTINGS_ABOUT_PAGE_RELAUNCH_AND_POWERWASH},
155 {"aboutUpgradeUpdatingChannelSwitch", 155 {"aboutUpgradeUpdatingChannelSwitch",
156 IDS_SETTINGS_UPGRADE_UPDATING_CHANNEL_SWITCH}, 156 IDS_SETTINGS_UPGRADE_UPDATING_CHANNEL_SWITCH},
157 {"aboutUpgradeSuccessChannelSwitch", 157 {"aboutUpgradeSuccessChannelSwitch",
158 IDS_SETTINGS_UPGRADE_SUCCESSFUL_CHANNEL_SWITCH}, 158 IDS_SETTINGS_UPGRADE_SUCCESSFUL_CHANNEL_SWITCH},
159
160 // About page, channel switcher dialog.
161 {"aboutChangeChannel",
162 IDS_SETTINGS_ABOUT_PAGE_CHANGE_CHANNEL},
dschuyler 2016/05/26 01:35:50 nit: this could unwrap, if desired.
dpapad 2016/05/26 17:58:55 Done. I just ran clang-format on this file, instea
163 {"aboutChangeChannelAndPowerwash",
164 IDS_SETTINGS_ABOUT_PAGE_CHANGE_CHANNEL_AND_POWERWASH},
165 {"aboutDelayedWarningMessage",
166 IDS_SETTINGS_ABOUT_PAGE_DELAYED_WARNING_MESSAGE},
167 {"aboutDelayedWarningTitle",
168 IDS_SETTINGS_ABOUT_PAGE_DELAYED_WARNING_TITLE},
169 {"aboutPowerwashWarningMessage",
170 IDS_SETTINGS_ABOUT_PAGE_POWERWASH_WARNING_MESSAGE},
171 {"aboutPowerwashWarningTitle",
172 IDS_SETTINGS_ABOUT_PAGE_POWERWASH_WARNING_TITLE},
173 {"aboutUnstableWarningMessage",
174 IDS_SETTINGS_ABOUT_PAGE_UNSTABLE_WARNING_MESSAGE},
175 {"aboutUnstableWarningTitle",
176 IDS_SETTINGS_ABOUT_PAGE_UNSTABLE_WARNING_TITLE},
159 #endif 177 #endif
160
161 }; 178 };
162 AddLocalizedStringsBulk(html_source, localized_strings, 179 AddLocalizedStringsBulk(html_source, localized_strings,
163 arraysize(localized_strings)); 180 arraysize(localized_strings));
164 181
165 html_source->AddString( 182 html_source->AddString(
166 "aboutUpgradeUpToDate", 183 "aboutUpgradeUpToDate",
167 #if defined(OS_CHROMEOS) 184 #if defined(OS_CHROMEOS)
168 ash::SubstituteChromeOSDeviceType(IDS_SETTINGS_UPGRADE_UP_TO_DATE)); 185 ash::SubstituteChromeOSDeviceType(IDS_SETTINGS_UPGRADE_UP_TO_DATE));
169 #else 186 #else
170 l10n_util::GetStringUTF16(IDS_SETTINGS_UPGRADE_UP_TO_DATE)); 187 l10n_util::GetStringUTF16(IDS_SETTINGS_UPGRADE_UP_TO_DATE));
(...skipping 868 matching lines...) Expand 10 before | Expand all | Expand 10 after
1039 #endif 1056 #endif
1040 AddUsersStrings(html_source); 1057 AddUsersStrings(html_source);
1041 AddWebContentStrings(html_source); 1058 AddWebContentStrings(html_source);
1042 1059
1043 policy_indicator::AddLocalizedStrings(html_source); 1060 policy_indicator::AddLocalizedStrings(html_source);
1044 1061
1045 html_source->SetJsonPath(kLocalizedStringsFile); 1062 html_source->SetJsonPath(kLocalizedStringsFile);
1046 } 1063 }
1047 1064
1048 } // namespace settings 1065 } // namespace settings
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698