[MD settings] reorder and update settings sections

chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.h"
 
 #include <string>
 
 #include "base/strings/utf_string_conversions.h"
 #include "build/build_config.h"
@@ skipping 51 matching lines @@
       {"ok", IDS_OK},
       {"save", IDS_SAVE},
       {"advancedPageTitle", IDS_SETTINGS_ADVANCED},
       {"basicPageTitle", IDS_SETTINGS_BASIC},
       {"settings", IDS_SETTINGS_SETTINGS},
   };
   AddLocalizedStringsBulk(html_source, localized_strings,
                           arraysize(localized_strings));
 }
 
+void AddA11yStrings(content::WebUIDataSource* html_source) {
+  LocalizedString localized_strings[] = {
+    {"a11yPageTitle", IDS_SETTINGS_ACCESSIBILITY},
+#if defined(OS_CHROMEOS)
+    {"moreFeaturesLink", IDS_SETTINGS_MORE_FEATURES_LINK},
+    {"optionsInMenuLabel", IDS_SETTINGS_OPTIONS_IN_MENU_LABEL},
+    {"largeMouseCursorLabel", IDS_SETTINGS_LARGE_MOUSE_CURSOR_LABEL},
+    {"highContrastLabel", IDS_SETTINGS_HIGH_CONTRAST_LABEL},
+    {"stickyKeysLabel", IDS_SETTINGS_STICKY_KEYS_LABEL},
+    {"chromeVoxLabel", IDS_SETTINGS_CHROMEVOX_LABEL},
+    {"screenMagnifierLabel", IDS_SETTINGS_SCREEN_MAGNIFIER_LABEL},
+    {"tapDraggingLabel", IDS_SETTINGS_TAP_DRAGGING_LABEL},
+    {"clickOnStopLabel", IDS_SETTINGS_CLICK_ON_STOP_LABEL},
+    {"delayBeforeClickLabel", IDS_SETTINGS_DELAY_BEFORE_CLICK_LABEL},
+    {"delayBeforeClickExtremelyShort",
+     IDS_SETTINGS_DELAY_BEFORE_CLICK_EXTREMELY_SHORT},
+    {"delayBeforeClickVeryShort", IDS_SETTINGS_DELAY_BEFORE_CLICK_VERY_SHORT},
+    {"delayBeforeClickShort", IDS_SETTINGS_DELAY_BEFORE_CLICK_SHORT},
+    {"delayBeforeClickLong", IDS_SETTINGS_DELAY_BEFORE_CLICK_LONG},
+    {"delayBeforeClickVeryLong", IDS_SETTINGS_DELAY_BEFORE_CLICK_VERY_LONG},
+    {"onScreenKeyboardLabel", IDS_SETTINGS_ON_SCREEN_KEYBOARD_LABEL},
+    {"a11yExplanation", IDS_SETTINGS_ACCESSIBILITY_EXPLANATION},
+#endif
+  };
+  AddLocalizedStringsBulk(html_source, localized_strings,
+                          arraysize(localized_strings));
+
+#if defined(OS_CHROMEOS)
+  html_source->AddString("a11yLearnMoreUrl",
+                         chrome::kChromeAccessibilityHelpURL);
+#endif
+}
+
+void AddAboutStrings(content::WebUIDataSource* html_source) {
+  LocalizedString localized_strings[] = {
+      {"aboutProgram", IDS_SETTINGS_ABOUT_PROGRAM},
+  };
+  AddLocalizedStringsBulk(html_source, localized_strings,
+                          arraysize(localized_strings));
+}
+
 #if defined(OS_CHROMEOS)
-void AddA11yStrings(content::WebUIDataSource* html_source) {
-  LocalizedString localized_strings[] = {
-      {"a11yPageTitle", IDS_SETTINGS_ACCESSIBILITY},
-      {"moreFeaturesLink", IDS_SETTINGS_MORE_FEATURES_LINK},
-      {"optionsInMenuLabel", IDS_SETTINGS_OPTIONS_IN_MENU_LABEL},
-      {"largeMouseCursorLabel", IDS_SETTINGS_LARGE_MOUSE_CURSOR_LABEL},
-      {"highContrastLabel", IDS_SETTINGS_HIGH_CONTRAST_LABEL},
-      {"stickyKeysLabel", IDS_SETTINGS_STICKY_KEYS_LABEL},
-      {"chromeVoxLabel", IDS_SETTINGS_CHROMEVOX_LABEL},
-      {"screenMagnifierLabel", IDS_SETTINGS_SCREEN_MAGNIFIER_LABEL},
-      {"tapDraggingLabel", IDS_SETTINGS_TAP_DRAGGING_LABEL},
-      {"clickOnStopLabel", IDS_SETTINGS_CLICK_ON_STOP_LABEL},
-      {"delayBeforeClickLabel", IDS_SETTINGS_DELAY_BEFORE_CLICK_LABEL},
-      {"delayBeforeClickExtremelyShort",
-       IDS_SETTINGS_DELAY_BEFORE_CLICK_EXTREMELY_SHORT},
-      {"delayBeforeClickVeryShort", IDS_SETTINGS_DELAY_BEFORE_CLICK_VERY_SHORT},
-      {"delayBeforeClickShort", IDS_SETTINGS_DELAY_BEFORE_CLICK_SHORT},
-      {"delayBeforeClickLong", IDS_SETTINGS_DELAY_BEFORE_CLICK_LONG},
-      {"delayBeforeClickVeryLong", IDS_SETTINGS_DELAY_BEFORE_CLICK_VERY_LONG},
-      {"onScreenKeyboardLabel", IDS_SETTINGS_ON_SCREEN_KEYBOARD_LABEL},
-      {"a11yExplanation", IDS_SETTINGS_ACCESSIBILITY_EXPLANATION},
-  };
-  AddLocalizedStringsBulk(html_source, localized_strings,
-                          arraysize(localized_strings));
-
-  html_source->AddString("a11yLearnMoreUrl",
-                         chrome::kChromeAccessibilityHelpURL);
-}
-#endif
-
-#if defined(OS_CHROMEOS)
 void AddAccountUITweaksStrings(content::WebUIDataSource* html_source,
                                Profile* profile) {
   base::DictionaryValue localized_values;
   chromeos::AddAccountUITweaksLocalizedValues(&localized_values, profile);
   html_source->AddLocalizedStrings(localized_values);
 }
 #endif
 
 void AddAppearanceStrings(content::WebUIDataSource* html_source) {
   LocalizedString localized_strings[] = {
@@ skipping 111 matching lines @@
       {"clearDataWeek", IDS_SETTINGS_CLEAR_DATA_WEEK},
       {"clearData4Weeks", IDS_SETTINGS_CLEAR_DATA_4WEEKS},
       {"clearDataEverything", IDS_SETTINGS_CLEAR_DATA_EVERYTHING},
       {"warnAboutNonClearedData", IDS_SETTINGS_CLEAR_DATA_SOME_STUFF_REMAINS},
       {"clearsSyncedData", IDS_SETTINGS_CLEAR_DATA_CLEARS_SYNCED_DATA},
   };
   AddLocalizedStringsBulk(html_source, localized_strings,
                           arraysize(localized_strings));
 }
 
+void AddCloudPrintStrings(content::WebUIDataSource* html_source) {
+  LocalizedString localized_strings[] = {
+      {"googleCloudPrint", IDS_SETTINGS_GOOGLE_CLOUD_PRINT},
+  };
+  AddLocalizedStringsBulk(html_source, localized_strings,
+                          arraysize(localized_strings));
+}
+
 #if !defined(OS_CHROMEOS)
 void AddDefaultBrowserStrings(content::WebUIDataSource* html_source) {
   LocalizedString localized_strings[] = {
       {"defaultBrowser", IDS_SETTINGS_DEFAULT_BROWSER},
       {"defaultBrowserDefault", IDS_SETTINGS_DEFAULT_BROWSER_DEFAULT},
       {"defaultBrowserMakeDefault", IDS_SETTINGS_DEFAULT_BROWSER_MAKE_DEFAULT},
       {"defaultBrowserUnknown", IDS_SETTINGS_DEFAULT_BROWSER_UNKNOWN},
       {"defaultBrowserSecondary", IDS_SETTINGS_DEFAULT_BROWSER_SECONDARY},
       {"unableToSetDefaultBrowser", IDS_SETTINGS_DEFAULT_BROWSER_ERROR},
   };
@@ skipping 517 matching lines @@
 }
 
 }  // namespace
 
 namespace settings {
 
 void AddLocalizedStrings(content::WebUIDataSource* html_source,
                          Profile* profile) {
   AddCommonStrings(html_source);
 
+  AddA11yStrings(html_source);
+  AddAboutStrings(html_source);
 #if defined(OS_CHROMEOS)
-  AddA11yStrings(html_source);
   AddAccountUITweaksStrings(html_source, profile);
 #endif
   AddAppearanceStrings(html_source);
 #if defined(OS_CHROMEOS)
   AddBluetoothStrings(html_source);
 #endif
   AddCertificateManagerStrings(html_source);
   AddClearBrowsingDataStrings(html_source);
+  AddCloudPrintStrings(html_source);
 #if !defined(OS_CHROMEOS)
   AddDefaultBrowserStrings(html_source);
 #endif
   AddDateTimeStrings(html_source);
 #if defined(OS_CHROMEOS)
   AddDeviceStrings(html_source);
 #endif
   AddDownloadsStrings(html_source);
 
 #if defined(OS_CHROMEOS)
@@ skipping 18 matching lines @@
 #endif
   AddUsersStrings(html_source);
   AddWebContentStrings(html_source);
 
   policy_indicator::AddLocalizedStrings(html_source);
 
   html_source->SetJsonPath(kLocalizedStringsFile);
 }
 
 }  // namespace settings