[HBD] Update MD Site Settings Plugins section to show 3rd mode checkbox.

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/command_line.h"
 #include "base/i18n/number_formatting.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "build/build_config.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/webui/policy_indicator_localized_strings_provider.h"
+#include "chrome/common/chrome_features.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/grit/chromium_strings.h"
 #include "chrome/grit/generated_resources.h"
 #include "chrome/grit/locale_settings.h"
 #include "components/autofill/core/browser/payments/payments_service_url.h"
 #include "components/autofill/core/common/autofill_constants.h"
 #include "components/google/core/browser/google_util.h"
 #include "components/password_manager/core/browser/password_manager_constants.h"
 #include "content/public/browser/web_ui_data_source.h"
 #include "grit/components_strings.h"
@@ skipping 1090 matching lines @@
       {"cookieCacheStorage", IDS_COOKIES_CACHE_STORAGE},
       {"cookieChannelId", IDS_COOKIES_CHANNEL_ID},
       {"cookieDatabaseStorage", IDS_COOKIES_DATABASE_STORAGE},
       {"cookieFileSystem", IDS_COOKIES_FILE_SYSTEM},
       {"cookieFlashLso", IDS_COOKIES_FLASH_LSO},
       {"cookieLocalStorage", IDS_COOKIES_LOCAL_STORAGE},
       {"cookiePlural", IDS_COOKIES_PLURAL_COOKIES},
       {"cookieServiceWorker", IDS_COOKIES_SERVICE_WORKER},
       {"cookieSingular", IDS_COOKIES_SINGLE_COOKIE},
       {"embeddedOnHost", IDS_EXCEPTIONS_GEOLOCATION_EMBEDDED_ON_HOST},
-      {"appCacheManifest",
-       IDS_COOKIES_APPLICATION_CACHE_MANIFEST_LABEL},
+      {"appCacheManifest", IDS_COOKIES_APPLICATION_CACHE_MANIFEST_LABEL},
       {"cacheStorageLastModified",
        IDS_COOKIES_LOCAL_STORAGE_LAST_MODIFIED_LABEL},
       {"cacheStorageOrigin", IDS_COOKIES_LOCAL_STORAGE_ORIGIN_LABEL},
-      {"cacheStorageSize",
-       IDS_COOKIES_LOCAL_STORAGE_SIZE_ON_DISK_LABEL},
+      {"cacheStorageSize", IDS_COOKIES_LOCAL_STORAGE_SIZE_ON_DISK_LABEL},
       {"channelIdServerId", IDS_COOKIES_CHANNEL_ID_ORIGIN_LABEL},
       {"channelIdType", IDS_COOKIES_CHANNEL_ID_TYPE_LABEL},
       {"channelIdCreated", IDS_COOKIES_CHANNEL_ID_CREATED_LABEL},
       {"channelIdExpires", IDS_COOKIES_CHANNEL_ID_EXPIRES_LABEL},
       {"cookieAccessibleToScript",
        IDS_COOKIES_COOKIE_ACCESSIBLE_TO_SCRIPT_LABEL},
       {"cookieLastAccessed", IDS_COOKIES_LAST_ACCESSED_LABEL},
       {"cookieContent", IDS_COOKIES_COOKIE_CONTENT_LABEL},
       {"cookieCreated", IDS_COOKIES_COOKIE_CREATED_LABEL},
       {"cookieDomain", IDS_COOKIES_COOKIE_DOMAIN_LABEL},
       {"cookieExpires", IDS_COOKIES_COOKIE_EXPIRES_LABEL},
       {"cookieName", IDS_COOKIES_COOKIE_NAME_LABEL},
       {"cookiePath", IDS_COOKIES_COOKIE_PATH_LABEL},
       {"cookieSendFor", IDS_COOKIES_COOKIE_SENDFOR_LABEL},
       {"fileSystemOrigin", IDS_COOKIES_LOCAL_STORAGE_ORIGIN_LABEL},
       {"fileSystemPersistentUsage",
        IDS_COOKIES_FILE_SYSTEM_PERSISTENT_USAGE_LABEL},
       {"fileSystemTemporaryUsage",
        IDS_COOKIES_FILE_SYSTEM_TEMPORARY_USAGE_LABEL},
       {"indexedDbSize", IDS_COOKIES_LOCAL_STORAGE_SIZE_ON_DISK_LABEL},
-      {"indexedDbLastModified",
-       IDS_COOKIES_LOCAL_STORAGE_LAST_MODIFIED_LABEL},
+      {"indexedDbLastModified", IDS_COOKIES_LOCAL_STORAGE_LAST_MODIFIED_LABEL},
       {"indexedDbOrigin", IDS_COOKIES_LOCAL_STORAGE_ORIGIN_LABEL},
       {"localStorageLastModified",
        IDS_COOKIES_LOCAL_STORAGE_LAST_MODIFIED_LABEL},
       {"localStorageOrigin", IDS_COOKIES_LOCAL_STORAGE_ORIGIN_LABEL},
-      {"localStorageSize",
-       IDS_COOKIES_LOCAL_STORAGE_SIZE_ON_DISK_LABEL},
+      {"localStorageSize", IDS_COOKIES_LOCAL_STORAGE_SIZE_ON_DISK_LABEL},
       {"serviceWorkerOrigin", IDS_COOKIES_LOCAL_STORAGE_ORIGIN_LABEL},
       {"serviceWorkerScopes", IDS_COOKIES_SERVICE_WORKER_SCOPES_LABEL},
-      {"serviceWorkerSize",
-       IDS_COOKIES_LOCAL_STORAGE_SIZE_ON_DISK_LABEL},
+      {"serviceWorkerSize", IDS_COOKIES_LOCAL_STORAGE_SIZE_ON_DISK_LABEL},
       {"webdbDesc", IDS_COOKIES_WEB_DATABASE_DESCRIPTION_LABEL},
       {"siteSettingsCategoryPageTitle", IDS_SETTINGS_SITE_SETTINGS_CATEGORY},
       {"siteSettingsCategoryAllSites", IDS_SETTINGS_SITE_SETTINGS_ALL_SITES},
       {"siteSettingsCategoryCamera", IDS_SETTINGS_SITE_SETTINGS_CAMERA},
       {"siteSettingsCategoryCookies", IDS_SETTINGS_SITE_SETTINGS_COOKIES},
       {"siteSettingsCategoryHandlers", IDS_SETTINGS_SITE_SETTINGS_HANDLERS},
       {"siteSettingsCategoryImages", IDS_SETTINGS_SITE_SETTINGS_IMAGES},
       {"siteSettingsCategoryLocation", IDS_SETTINGS_SITE_SETTINGS_LOCATION},
       {"siteSettingsCategoryJavascript", IDS_SETTINGS_SITE_SETTINGS_JAVASCRIPT},
       {"siteSettingsCategoryMicrophone", IDS_SETTINGS_SITE_SETTINGS_MIC},
@@ skipping 11 matching lines @@
       {"siteSettingsKeygen", IDS_SETTINGS_SITE_SETTINGS_KEYGEN},
       {"siteSettingsLocation", IDS_SETTINGS_SITE_SETTINGS_LOCATION},
       {"siteSettingsMic", IDS_SETTINGS_SITE_SETTINGS_MIC},
       {"siteSettingsNotifications", IDS_SETTINGS_SITE_SETTINGS_NOTIFICATIONS},
       {"siteSettingsImages", IDS_SETTINGS_SITE_SETTINGS_IMAGES},
       {"siteSettingsJavascript", IDS_SETTINGS_SITE_SETTINGS_JAVASCRIPT},
       {"siteSettingsPlugins", IDS_SETTINGS_SITE_SETTINGS_PLUGINS},
       {"siteSettingsPopups", IDS_SETTINGS_SITE_SETTINGS_POPUPS},
       {"siteSettingsUnsandboxedPlugins",
        IDS_SETTINGS_SITE_SETTINGS_UNSANDBOXED_PLUGINS},
-      {"siteSettingsUsbDevices",
-       IDS_SETTINGS_SITE_SETTINGS_USB_DEVICES},
+      {"siteSettingsUsbDevices", IDS_SETTINGS_SITE_SETTINGS_USB_DEVICES},
       {"siteSettingsFullscreen", IDS_SETTINGS_SITE_SETTINGS_FULLSCREEN},
       {"siteSettingsMaySaveCookies",
        IDS_SETTINGS_SITE_SETTINGS_MAY_SAVE_COOKIES},
       {"siteSettingsAskFirst", IDS_SETTINGS_SITE_SETTINGS_ASK_FIRST},
       {"siteSettingsAskFirstRecommended",
        IDS_SETTINGS_SITE_SETTINGS_ASK_FIRST_RECOMMENDED},
       {"siteSettingsAskBeforeAccessing",
        IDS_SETTINGS_SITE_SETTINGS_ASK_BEFORE_ACCESSING},
       {"siteSettingsAskBeforeAccessingRecommended",
        IDS_SETTINGS_SITE_SETTINGS_ASK_BEFORE_ACCESSING_RECOMMENDED},
       {"siteSettingsAskBeforeSending",
        IDS_SETTINGS_SITE_SETTINGS_ASK_BEFORE_SENDING},
       {"siteSettingsAskBeforeSendingRecommended",
        IDS_SETTINGS_SITE_SETTINGS_ASK_BEFORE_SENDING_RECOMMENDED},
-      {"siteSettingsDetectAndRunImportant",
-       IDS_SETTINGS_SITE_SETTINGS_PLUGINS_DETECT_IMPORTANT},
-      {"siteSettingsDetectAndRunImportantRecommended",
-       IDS_SETTINGS_SITE_SETTINGS_PLUGINS_DETECT_IMPORTANT_RECOMMENDED},
-      {"siteSettingsLetMeChoose",
-       IDS_SETTINGS_SITE_SETTINGS_PLUGINS_CHOOSE},
+      {"siteSettingsFlashAllow", IDS_SETTINGS_SITE_SETTINGS_FLASH_ALLOW},
       {"siteSettingsAllowRecentlyClosedSites",
        IDS_SETTINGS_SITE_SETTINGS_BACKGROUND_SYNC_ALLOW_RECENTLY_CLOSED_SITES},
       {"siteSettingsAllowRecentlyClosedSitesRecommended",
        IDS_SETTINGS_SITE_SETTINGS_BACKGROUND_SYNC_ALLOW_RECENTLY_CLOSED_SITES_RECOMMENDED},
       {"siteSettingsBackgroundSyncBlocked",
        IDS_SETTINGS_SITE_SETTINGS_BACKGROUND_SYNC_BLOCKED},
-      {"siteSettingsHandlersAsk",
-       IDS_SETTINGS_SITE_SETTINGS_HANDLERS_ASK},
+      {"siteSettingsHandlersAsk", IDS_SETTINGS_SITE_SETTINGS_HANDLERS_ASK},
       {"siteSettingsHandlersAskRecommended",
        IDS_SETTINGS_SITE_SETTINGS_HANDLERS_ASK_RECOMMENDED},
       {"siteSettingsHandlersBlocked",
        IDS_SETTINGS_SITE_SETTINGS_HANDLERS_BLOCKED},
-      {"siteSettingsKeygenAllow",
-       IDS_SETTINGS_SITE_SETTINGS_KEYGEN_ALLOW},
-      {"siteSettingsKeygenBlock",
-       IDS_SETTINGS_SITE_SETTINGS_KEYGEN_BLOCK},
+      {"siteSettingsKeygenAllow", IDS_SETTINGS_SITE_SETTINGS_KEYGEN_ALLOW},
+      {"siteSettingsKeygenBlock", IDS_SETTINGS_SITE_SETTINGS_KEYGEN_BLOCK},
       {"siteSettingsKeygenBlockRecommended",
        IDS_SETTINGS_SITE_SETTINGS_KEYGEN_BLOCK_RECOMMENDED},
       {"siteSettingsAutoDownloadAsk",
        IDS_SETTINGS_SITE_SETTINGS_AUTOMATIC_DOWNLOAD_ASK},
       {"siteSettingsAutoDownloadAskRecommended",
        IDS_SETTINGS_SITE_SETTINGS_AUTOMATIC_DOWNLOAD_ASK_RECOMMENDED},
       {"siteSettingsAutoDownloadBlock",
        IDS_SETTINGS_SITE_SETTINGS_AUTOMATIC_DOWNLOAD_BLOCK},
       {"siteSettingsUnsandboxedPluginsAsk",
        IDS_SETTINGS_SITE_SETTINGS_UNSANDBOXED_PLUGINS_ASK},
@@ skipping 38 matching lines @@
        IDS_SETTINGS_SITE_SETTINGS_COOKIE_REMOVE_ALL},
       {"thirdPartyCookie", IDS_SETTINGS_SITE_SETTINGS_THIRD_PARTY_COOKIE},
       {"thirdPartyCookieSublabel",
        IDS_SETTINGS_SITE_SETTINGS_THIRD_PARTY_COOKIE_SUBLABEL},
       {"handlerIsDefault", IDS_SETTINGS_SITE_SETTINGS_HANDLER_IS_DEFAULT},
       {"handlerSetDefault", IDS_SETTINGS_SITE_SETTINGS_HANDLER_SET_DEFAULT},
       {"handlerRemove", IDS_SETTINGS_SITE_SETTINGS_REMOVE},
   };
   AddLocalizedStringsBulk(html_source, localized_strings,
                           arraysize(localized_strings));
+
+  if (base::FeatureList::IsEnabled(features::kPreferHtmlOverPlugins)) {

[Finnur, 2016/08/29 11:26:27]

MD-Settings uses only IMPORTANT_CONTENT. I presume that setting is also
overloaded elsewhere in the plugins c++ code (so this just works)? 

[tommycli, 2016/08/29 18:31:46]

Arg.... this is really annoying, but "Ask before running" will still be stored
on disk as the DETECT_IMPORTANT_CONTENT content setting for now.

In the future, I will move it back to the ASK setting, but I will have to figure
out how to do it on a separate CL.

+    LocalizedString flash_strings[] = {
+        {"siteSettingsFlashAskBefore",
+         IDS_SETTINGS_SITE_SETTINGS_FLASH_ASK_BEFORE_RUNNING},
+        {"siteSettingsFlashAskBeforeRecommended",
+         IDS_SETTINGS_SITE_SETTINGS_FLASH_ASK_BEFORE_RUNNING_RECOMMENDED},
+    };
+    AddLocalizedStringsBulk(html_source, flash_strings,
+                            arraysize(flash_strings));
+  } else {
+    LocalizedString flash_strings[] = {
+        {"siteSettingsFlashAskBefore",
+         IDS_SETTINGS_SITE_SETTINGS_FLASH_DETECT_IMPORTANT},
+        {"siteSettingsFlashAskBeforeRecommended",
+         IDS_SETTINGS_SITE_SETTINGS_FLASH_DETECT_IMPORTANT_RECOMMENDED},
+    };
+    AddLocalizedStringsBulk(html_source, flash_strings,
+                            arraysize(flash_strings));
+  }
 }
 
 void AddUsersStrings(content::WebUIDataSource* html_source) {
   LocalizedString localized_strings[] = {
     {"usersPageTitle", IDS_SETTINGS_USERS},
 #if defined(OS_CHROMEOS)
     {"usersModifiedByOwnerLabel", IDS_SETTINGS_USERS_MODIFIED_BY_OWNER_LABEL},
     {"guestBrowsingLabel", IDS_SETTINGS_USERS_GUEST_BROWSING_LABEL},
     {"settingsManagedLabel", IDS_SETTINGS_USERS_MANAGED_LABEL},
     {"supervisedUsersLabel", IDS_SETTINGS_USERS_SUPERVISED_USERS_LABEL},
@@ skipping 131 matching lines @@
 #endif
   AddUsersStrings(html_source);
   AddWebContentStrings(html_source);
 
   policy_indicator::AddLocalizedStrings(html_source);
 
   html_source->SetJsonPath(kLocalizedStringsFile);
 }
 
 }  // namespace settings