Plugin Power Saver: Add back 'Click to play' option as 4th for plugins.

chrome/browser/ui/webui/options/content_settings_handler.cc

 // Copyright (c) 2012 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/options/content_settings_handler.h"
 
 #include <algorithm>
 #include <map>
 #include <vector>
 
@@ skipping 307 matching lines @@
     // JavaScript filter.
     {"javascriptTabLabel", IDS_JAVASCRIPT_TAB_LABEL},
     {"javascript_header", IDS_JAVASCRIPT_HEADER},
     {"javascriptAllow", IDS_JS_ALLOW_RADIO},
     {"javascriptBlock", IDS_JS_DONOTALLOW_RADIO},
     // Plug-ins filter.
     {"pluginsTabLabel", IDS_PLUGIN_TAB_LABEL},
     {"plugins_header", IDS_PLUGIN_HEADER},
     {"pluginsAllow", IDS_PLUGIN_ALLOW_RADIO},
     {"pluginsDetect", IDS_PLUGIN_DETECT_RADIO},
+    {"pluginsAsk", IDS_PLUGIN_ASK_RADIO},
     {"pluginsBlock", IDS_PLUGIN_BLOCK_RADIO},
     {"disableIndividualPlugins", IDS_PLUGIN_SELECTIVE_DISABLE},
     // Pop-ups filter.
     {"popupsTabLabel", IDS_POPUP_TAB_LABEL},
     {"popups_header", IDS_POPUP_HEADER},
     {"popupsAllow", IDS_POPUP_ALLOW_RADIO},
     {"popupsBlock", IDS_POPUP_BLOCK_RADIO},
     // Location filter.
     {"locationTabLabel", IDS_GEOLOCATION_TAB_LABEL},
     {"location_header", IDS_GEOLOCATION_HEADER},
@@ skipping 249 matching lines @@
 }
 
 void ContentSettingsHandler::UpdateSettingDefaultFromModel(
     ContentSettingsType type) {
   Profile* profile = Profile::FromWebUI(web_ui());
   std::string provider_id;
   ContentSetting default_setting =
       profile->GetHostContentSettingsMap()->GetDefaultContentSetting(
           type, &provider_id);
 
-  // For Plugins, display the obsolete ASK setting as BLOCK.
-  if (type == ContentSettingsType::CONTENT_SETTINGS_TYPE_PLUGINS &&
-      default_setting == ContentSetting::CONTENT_SETTING_ASK) {
-    default_setting = ContentSetting::CONTENT_SETTING_BLOCK;
-  }
-
   base::DictionaryValue filter_settings;
   filter_settings.SetString(ContentSettingsTypeToGroupName(type) + ".value",
                             ContentSettingToString(default_setting));
   filter_settings.SetString(
       ContentSettingsTypeToGroupName(type) + ".managedBy", provider_id);
 
   web_ui()->CallJavascriptFunction(
       "ContentSettings.setContentFilterSettingsValue", filter_settings);
 }
 
@@ skipping 912 matching lines @@
 
   // Exceptions apply only when the feature is enabled.
   PrefService* prefs = user_prefs::UserPrefs::Get(GetBrowserContext(web_ui()));
   bool enable_exceptions = prefs->GetBoolean(prefs::kEnableDRM);
   web_ui()->CallJavascriptFunction(
       "ContentSettings.enableProtectedContentExceptions",
       base::FundamentalValue(enable_exceptions));
 }
 
 }  // namespace options