| Index: chrome/browser/content_settings/content_settings_utils.cc
|
| diff --git a/chrome/browser/content_settings/content_settings_utils.cc b/chrome/browser/content_settings/content_settings_utils.cc
|
| index b6c2dae69afdffc56c60501c5989bb53ced45a8c..6eefa4c2b0d94b705f28f15decb5d4e267778c9b 100644
|
| --- a/chrome/browser/content_settings/content_settings_utils.cc
|
| +++ b/chrome/browser/content_settings/content_settings_utils.cc
|
| @@ -48,17 +48,6 @@ std::string GetTypeName(ContentSettingsType type) {
|
| return std::string(kTypeNames[type]);
|
| }
|
|
|
| -ContentSetting ClickToPlayFixup(ContentSettingsType content_type,
|
| - ContentSetting setting) {
|
| - if (setting == CONTENT_SETTING_ASK &&
|
| - content_type == CONTENT_SETTINGS_TYPE_PLUGINS &&
|
| - !CommandLine::ForCurrentProcess()->HasSwitch(
|
| - switches::kEnableClickToPlay)) {
|
| - return CONTENT_SETTING_BLOCK;
|
| - }
|
| - return setting;
|
| -}
|
| -
|
| std::string CreatePatternString(
|
| const ContentSettingsPattern& item_pattern,
|
| const ContentSettingsPattern& top_level_frame_pattern) {
|
|
|