Revert 179093

chrome/browser/ui/content_settings/content_setting_image_model.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/content_settings/content_setting_image_model.h"
 
 #include "chrome/browser/content_settings/host_content_settings_map.h"
 #include "chrome/browser/content_settings/tab_specific_content_settings.h"
 #include "chrome/browser/prerender/prerender_manager.h"
 #include "chrome/browser/profiles/profile.h"
@@ skipping 12 matching lines @@
   virtual void UpdateFromWebContents(WebContents* web_contents) OVERRIDE;
 };
 
 class ContentSettingGeolocationImageModel : public ContentSettingImageModel {
  public:
   ContentSettingGeolocationImageModel();
 
   virtual void UpdateFromWebContents(WebContents* web_contents) OVERRIDE;
 };
 
-// Image model for displaying media icons in the location bar.
-class ContentSettingMediaImageModel : public ContentSettingImageModel {
- public:
-  ContentSettingMediaImageModel();
-
-  virtual void UpdateFromWebContents(WebContents* web_contents) OVERRIDE;
-};
-
 class ContentSettingRPHImageModel : public ContentSettingImageModel {
  public:
   ContentSettingRPHImageModel();
 
   virtual void UpdateFromWebContents(WebContents* web_contents) OVERRIDE;
 };
 
 class ContentSettingNotificationsImageModel : public ContentSettingImageModel {
  public:
   ContentSettingNotificationsImageModel();
@@ skipping 116 matching lines @@
   unsigned int tab_state_flags = 0;
   settings_state.GetDetailedInfo(NULL, &tab_state_flags);
   bool allowed =
       !!(tab_state_flags & GeolocationSettingsState::TABSTATE_HAS_ANY_ALLOWED);
   set_icon(allowed ? IDR_GEOLOCATION_ALLOWED_LOCATIONBAR_ICON :
       IDR_GEOLOCATION_DENIED_LOCATIONBAR_ICON);
   set_tooltip(l10n_util::GetStringUTF8(allowed ?
       IDS_GEOLOCATION_ALLOWED_TOOLTIP : IDS_GEOLOCATION_BLOCKED_TOOLTIP));
 }
 
-ContentSettingMediaImageModel::ContentSettingMediaImageModel()
-    : ContentSettingImageModel(CONTENT_SETTINGS_TYPE_MEDIASTREAM) {
-}
-
-void ContentSettingMediaImageModel::UpdateFromWebContents(
-    WebContents* web_contents) {
-  set_visible(false);
-  if (!web_contents)
-    return;
-
-  TabSpecificContentSettings* content_settings =
-      TabSpecificContentSettings::FromWebContents(web_contents);
-  if (!content_settings)
-    return;
-
-  bool blocked =
-      content_settings->IsContentBlocked(CONTENT_SETTINGS_TYPE_MEDIASTREAM);
-  if (!blocked &&
-      !content_settings->IsContentAccessed(get_content_settings_type()))
-    return;
-
-  set_tooltip(
-      l10n_util::GetStringUTF8(blocked ?
-          IDS_MEDIASTREAM_BLOCKED_TOOLTIP : IDS_MEDIASTREAM_ALLOWED_TOOLTIP));
-  set_icon(blocked ? IDR_BLOCKED_MEDIA : IDR_ASK_MEDIA);
-  set_visible(true);
-}
-
 ContentSettingRPHImageModel::ContentSettingRPHImageModel()
     : ContentSettingImageModel(
         CONTENT_SETTINGS_TYPE_PROTOCOL_HANDLERS) {
   set_icon(IDR_REGISTER_PROTOCOL_HANDLER_LOCATIONBAR_ICON);
   set_tooltip(l10n_util::GetStringUTF8(IDS_REGISTER_PROTOCOL_HANDLER_TOOLTIP));
 }
 
 void ContentSettingRPHImageModel::UpdateFromWebContents(
     WebContents* web_contents) {
   set_visible(false);
@@ skipping 32 matching lines @@
 ContentSettingImageModel*
     ContentSettingImageModel::CreateContentSettingImageModel(
     ContentSettingsType content_settings_type) {
   switch (content_settings_type) {
     case CONTENT_SETTINGS_TYPE_GEOLOCATION:
       return new ContentSettingGeolocationImageModel();
     case CONTENT_SETTINGS_TYPE_NOTIFICATIONS:
       return new ContentSettingNotificationsImageModel();
     case CONTENT_SETTINGS_TYPE_PROTOCOL_HANDLERS:
       return new ContentSettingRPHImageModel();
-    case CONTENT_SETTINGS_TYPE_MEDIASTREAM:
-      return new ContentSettingMediaImageModel();
     default:
       return new ContentSettingBlockedImageModel(content_settings_type);
   }
 }