Add tooltips to cr-policy-indicator

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 "base/strings/utf_string_conversions.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/grit/chromium_strings.h"
 #include "chrome/grit/generated_resources.h"
 #include "chrome/grit/google_chrome_strings.h"
 #include "chrome/grit/locale_settings.h"
 #include "content/public/browser/web_ui_data_source.h"
 #include "ui/base/l10n/l10n_util.h"
 
 #if defined(OS_CHROMEOS)
 #include "ui/chromeos/strings/grit/ui_chromeos_strings.h"
 #endif
 
 namespace {
 
 // Note that settings.html contains a <script> tag which imports a script of
 // the following name. These names must be kept in sync.
 const char kLocalizedStringsFile[] = "strings.js";
 
+void AddCommonStrings(content::WebUIDataSource* html_source) {
+  html_source->AddLocalizedString("basicPageTitle", IDS_SETTINGS_BASIC);
+  html_source->AddLocalizedString("advancedPageTitle", IDS_SETTINGS_ADVANCED);
+  html_source->AddLocalizedString("addLabel", IDS_ADD);
+#if defined(OS_CHROMEOS)
+  html_source->AddLocalizedString("controlledSettingShared",
+                                  IDS_OPTIONS_CONTROLLED_SETTING_SHARED);
+  html_source->AddLocalizedString("controlledSettingOwner",
+                                  IDS_OPTIONS_CONTROLLED_SETTING_OWNER);
+#endif
+  html_source->AddLocalizedString("controlledSettingPolicy",
+                                  IDS_OPTIONS_CONTROLLED_SETTING_POLICY);
+  html_source->AddLocalizedString("controlledSettingRecommendedMatches",
+                                  IDS_OPTIONS_CONTROLLED_SETTING_RECOMMENDED);
+  html_source->AddLocalizedString(
+      "controlledSettingRecommendedDiffers",
+      IDS_OPTIONS_CONTROLLED_SETTING_HAS_RECOMMENDATION);
+  html_source->AddLocalizedString("controlledSettingExtension",
+                                  IDS_SETTINGS_CONTROLLED_SETTING_EXTENSION);
+}
+
 void AddA11yStrings(content::WebUIDataSource* html_source) {
   html_source->AddLocalizedString(
       "a11yPageTitle", IDS_SETTINGS_ACCESSIBILITY);
   html_source->AddLocalizedString(
       "moreFeaturesLink", IDS_SETTINGS_MORE_FEATURES_LINK);
   html_source->AddLocalizedString(
       "optionsInMenuLabel", IDS_SETTINGS_OPTIONS_IN_MENU_LABEL);
   html_source->AddLocalizedString(
       "largeMouseCursorLabel", IDS_SETTINGS_LARGE_MOUSE_CURSOR_LABEL);
   html_source->AddLocalizedString(
@@ skipping 84 matching lines @@
       "certificateManagerImportAndBind",
       IDS_SETTINGS_CERTIFICATE_MANAGER_IMPORT_AND_BIND);
   html_source->AddLocalizedString("certificateManagerExport",
                                   IDS_SETTINGS_CERTIFICATE_MANAGER_EXPORT);
   html_source->AddLocalizedString("certificateManagerDelete",
                                   IDS_SETTINGS_CERTIFICATE_MANAGER_DELETE);
   html_source->AddLocalizedString("certificateManagerDone",
                                   IDS_SETTINGS_CERTIFICATE_MANAGER_DONE);
 }
 
-void AddCommonStrings(content::WebUIDataSource* html_source) {

[Dan Beam, 2015/09/21 21:50:47]

this was alphabetized

[stevenjb, 2015/09/23 18:46:24]

I realize, but putting "Common" at top and moving the basic/advanced titles into
it made more sense to me. The rest are page based. I can revert it if you feel
strongly.

-  html_source->AddLocalizedString("addLabel", IDS_ADD);
-}
-
 void AddDownloadsStrings(content::WebUIDataSource* html_source) {
   html_source->AddLocalizedString(
       "downloadsPageTitle", IDS_SETTINGS_DOWNLOADS);
   html_source->AddLocalizedString(
       "downloadLocation", IDS_SETTINGS_DOWNLOAD_LOCATION);
   html_source->AddLocalizedString(
       "changeDownloadLocation", IDS_SETTINGS_CHANGE_DOWNLOAD_LOCATION);
   html_source->AddLocalizedString(
       "promptForDownload", IDS_SETTINGS_PROMPT_FOR_DOWNLOAD);
 }
@@ skipping 267 matching lines @@
                                   IDS_SETTINGS_USERS_RESTRICT_SIGNIN_LABEL);
   html_source->AddLocalizedString("addUsersLabel",
                                   IDS_SETTINGS_USERS_ADD_USERS_LABEL);
 }
 
 }  // namespace
 
 namespace settings {
 
 void AddLocalizedStrings(content::WebUIDataSource* html_source) {
-  html_source->AddLocalizedString("basicPageTitle",
-                                  IDS_SETTINGS_BASIC);
-  html_source->AddLocalizedString("advancedPageTitle",
-                                  IDS_SETTINGS_ADVANCED);
+  AddCommonStrings(html_source);
 
   AddA11yStrings(html_source);
   AddAppearanceStrings(html_source);
   AddCertificateManagerStrings(html_source);
-  AddCommonStrings(html_source);
   AddDownloadsStrings(html_source);
   AddDateTimeStrings(html_source);
 #if defined(OS_CHROMEOS)
   AddInternetStrings(html_source);
 #endif
   AddLanguagesStrings(html_source);
   AddOnStartupStrings(html_source);
   AddPrivacyStrings(html_source);
   AddSearchStrings(html_source);
   AddSearchEnginesStrings(html_source);
   AddSiteSettingsStrings(html_source);
   AddSyncStrings(html_source);
   AddUsersStrings(html_source);
   html_source->SetJsonPath(kLocalizedStringsFile);
 }
 
 }  // namespace settings