MD Settings: Cleanup ifdefs when registering localized strings.

MD Settings: Cleanup ifdefs when registering localized strings.

Keeping calls alphabetized within each ifdef seems more readable
than keeping them alphabetized overall, and having to repeat the
same ifdef condition multiple times. This also makes it easer to
use a tool for sorting.

BUG=None

Committed: https://crrev.com/9aa225706e9a79ebcddb6e233c6b7fb7d74c3169
Cr-Commit-Position: refs/heads/master@{#431750}

[dpapad, 2016-11-12 01:21:56]

The CQ bit was checked by dpapad@chromium.org to run a CQ dry run

[commit-bot: I haz the power, 2016-11-12 01:22:29]

Dry run: CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[dpapad, 2016-11-12 01:24:19]

Description was changed from

==========
MD Settings: Cleanup ifdefs when registering localized strings.

BUG=None
==========

to

==========
MD Settings: Cleanup ifdefs when registering localized strings.

Keeping calls alphabetized within each ifdef seems more readable
than keeping them alphabetized overall, and having to repeat the
same ifdef condition multiple times.

BUG=None
==========

[dpapad, 2016-11-12 01:24:31]

dpapad@chromium.org changed reviewers:
+ dbeam@chromium.org

[dpapad, 2016-11-12 01:26:18]

Description was changed from

==========
MD Settings: Cleanup ifdefs when registering localized strings.

Keeping calls alphabetized within each ifdef seems more readable
than keeping them alphabetized overall, and having to repeat the
same ifdef condition multiple times.

BUG=None
==========

to

==========
MD Settings: Cleanup ifdefs when registering localized strings.

Keeping calls alphabetized within each ifdef seems more readable
than keeping them alphabetized overall, and having to repeat the
same ifdef condition multiple times. This also makes it easer to
use a tool for sorting.

BUG=None
==========

[Dan Beam, 2016-11-12 01:41:57]

lgtm

https://codereview.chromium.org/2497113002/diff/1/chrome/browser/ui/webui/set...
File chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc
(right):

https://codereview.chromium.org/2497113002/diff/1/chrome/browser/ui/webui/set...
chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc:1780:
#if !defined(OS_CHROMEOS)
nit: #else

[dpapad, 2016-11-12 01:45:03]

https://codereview.chromium.org/2497113002/diff/1/chrome/browser/ui/webui/set...
File chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc
(right):

https://codereview.chromium.org/2497113002/diff/1/chrome/browser/ui/webui/set...
chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc:1780:
#if !defined(OS_CHROMEOS)
On 2016/11/12 at 01:41:57, Dan Beam wrote:
> nit: #else

Done.

[dpapad, 2016-11-12 01:45:33]

The CQ bit was checked by dpapad@chromium.org

[dpapad, 2016-11-12 01:45:34]

The patchset sent to the CQ was uploaded after l-g-t-m from dbeam@chromium.org
Link to the patchset: https://codereview.chromium.org/2497113002/#ps20001
(title: "Nit.")

[commit-bot: I haz the power, 2016-11-12 01:45:56]

CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2016-11-12 02:33:37]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2016-11-12 02:33:40]

Failed to apply patch for
chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc:
While running git apply --index -p1;
  error: patch failed:
chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc:1745
  error:
chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc:
patch does not apply

Patch:      
chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc
Index:
chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc
diff --git
a/chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc
b/chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc
index
caec04d0e44c33c173d47df6bc9051e67ed0ac5e..13bcfe07774fee5ae1a8b3e4cc4011896f87ec07
100644
--- a/chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc
+++ b/chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc
@@ -1745,40 +1745,13 @@ void AddCrNetworkStrings(content::WebUIDataSource*
html_source) {
 
 void AddLocalizedStrings(content::WebUIDataSource* html_source,
                          Profile* profile) {
-  AddCommonStrings(html_source, profile);
-
   AddA11yStrings(html_source);
   AddAboutStrings(html_source);
-#if defined(OS_CHROMEOS)
-  AddAccountUITweaksStrings(html_source, profile);
-#endif
   AddAppearanceStrings(html_source, profile);
-#if defined(OS_CHROMEOS)
-  AddBluetoothStrings(html_source);
-#endif
-#if defined(USE_NSS_CERTS)
-  AddCertificateManagerStrings(html_source);
-#endif
   AddClearBrowsingDataStrings(html_source);
-#if !defined(OS_CHROMEOS)
-  AddDefaultBrowserStrings(html_source);
-#endif
-#if defined(OS_CHROMEOS)
-  AddDateTimeStrings(html_source);
-  AddDeviceStrings(html_source);
-#endif
+  AddCommonStrings(html_source, profile);
   AddDownloadsStrings(html_source);
-
-#if defined(OS_CHROMEOS)
-  AddEasyUnlockStrings(html_source);
-  AddImportDataStrings(html_source);
-  AddInternetStrings(html_source);
-  AddCrNetworkStrings(html_source);
-#endif
   AddLanguagesStrings(html_source);
-#if defined(OS_CHROMEOS)
-  AddMultiProfilesStrings(html_source, profile);
-#endif
   AddOnStartupStrings(html_source);
   AddPasswordsAndFormsStrings(html_source);
   AddPeopleStrings(html_source);
@@ -1789,12 +1762,28 @@ void AddLocalizedStrings(content::WebUIDataSource*
html_source,
   AddSearchInSettingsStrings(html_source);
   AddSearchStrings(html_source);
   AddSiteSettingsStrings(html_source, profile);
-#if !defined(OS_CHROMEOS)
-  AddSystemStrings(html_source);
-#endif
   AddUsersStrings(html_source);
   AddWebContentStrings(html_source);
 
+#if defined(OS_CHROMEOS)
+  AddAccountUITweaksStrings(html_source, profile);
+  AddBluetoothStrings(html_source);
+  AddCrNetworkStrings(html_source);
+  AddDateTimeStrings(html_source);
+  AddDeviceStrings(html_source);
+  AddEasyUnlockStrings(html_source);
+  AddImportDataStrings(html_source);
+  AddInternetStrings(html_source);
+  AddMultiProfilesStrings(html_source, profile);
+#else
+  AddSystemStrings(html_source);
+  AddDefaultBrowserStrings(html_source);
+#endif
+
+#if defined(USE_NSS_CERTS)
+  AddCertificateManagerStrings(html_source);
+#endif
+
   policy_indicator::AddLocalizedStrings(html_source);
 
   html_source->SetJsonPath(kLocalizedStringsFile);

[commit-bot: I haz the power, 2016-11-12 02:34:44]

Description was changed from

==========
MD Settings: Cleanup ifdefs when registering localized strings.

Keeping calls alphabetized within each ifdef seems more readable
than keeping them alphabetized overall, and having to repeat the
same ifdef condition multiple times. This also makes it easer to
use a tool for sorting.

BUG=None
==========

to

==========
MD Settings: Cleanup ifdefs when registering localized strings.

Keeping calls alphabetized within each ifdef seems more readable
than keeping them alphabetized overall, and having to repeat the
same ifdef condition multiple times. This also makes it easer to
use a tool for sorting.

BUG=None

Committed: https://crrev.com/9aa225706e9a79ebcddb6e233c6b7fb7d74c3169
Cr-Commit-Position: refs/heads/master@{#431750}
==========

[commit-bot: I haz the power, 2016-11-12 02:34:45]

Patchset 2 (id:??) landed as
https://crrev.com/9aa225706e9a79ebcddb6e233c6b7fb7d74c3169
Cr-Commit-Position: refs/heads/master@{#431750}