(Views only) Replace the content settings icons on the Website Settings UI with the new icons.

chrome/browser/ui/website_settings/website_settings_ui.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/website_settings/website_settings_ui.h"
 
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "grit/ui_resources.h"
 #include "ui/base/l10n/l10n_util.h"
@@ skipping 113 matching lines @@
 
 // static
 const gfx::Image& WebsiteSettingsUI::GetPermissionIcon(
     ContentSettingsType type,
     ContentSetting setting) {
   bool use_blocked = (setting == CONTENT_SETTING_BLOCK);
   int resource_id = IDR_INFO;
   switch (type) {
     case CONTENT_SETTINGS_TYPE_IMAGES:
       resource_id = use_blocked ? IDR_BLOCKED_IMAGES
-                                : IDR_INFO;
+                                : IDR_ALLOWED_IMAGES;
       break;
     case CONTENT_SETTINGS_TYPE_JAVASCRIPT:
       resource_id = use_blocked ? IDR_BLOCKED_JAVASCRIPT
-                                : IDR_INFO;
+                                : IDR_ALLOWED_JAVASCRIPT;
       break;
     case CONTENT_SETTINGS_TYPE_COOKIES:
       resource_id = use_blocked ? IDR_BLOCKED_COOKIES
                                 : IDR_COOKIE_ICON;
       break;
     case CONTENT_SETTINGS_TYPE_POPUPS:
       resource_id = use_blocked ? IDR_BLOCKED_POPUPS
-                                : IDR_INFO;
+                                : IDR_ALLOWED_POPUPS;
       break;
     case CONTENT_SETTINGS_TYPE_PLUGINS:
       resource_id = use_blocked ? IDR_BLOCKED_PLUGINS
-                                : IDR_EXTENSIONS_FAVICON;
+                                : IDR_ALLOWED_PLUGINS;
       break;
     case CONTENT_SETTINGS_TYPE_GEOLOCATION:
       resource_id = use_blocked ? IDR_GEOLOCATION_DENIED_LOCATIONBAR_ICON
                                 : IDR_GEOLOCATION_ALLOWED_LOCATIONBAR_ICON;
       break;
     case CONTENT_SETTINGS_TYPE_NOTIFICATIONS:
+      resource_id = use_blocked ? IDR_BLOCKED_NOTIFICATION
+                                : IDR_ALLOWED_NOTIFICATION;
+      break;
     case CONTENT_SETTINGS_TYPE_FULLSCREEN:
+      resource_id = IDR_ALLOWED_FULLSCREEN;
+      break;
     case CONTENT_SETTINGS_TYPE_MOUSELOCK:
+      resource_id = use_blocked ? IDR_BLOCKED_MOUSE_CURSOR
+                                : IDR_ALLOWED_MOUSE_CURSOR;
+      break;
     case CONTENT_SETTINGS_TYPE_MEDIASTREAM:
-      resource_id = IDR_INFO;
+      resource_id = use_blocked ? IDR_BLOCKED_MEDIA
+                                : IDR_ASK_MEDIA;
       break;
     default:
       NOTREACHED();
       break;
   }
   ResourceBundle& rb = ResourceBundle::GetSharedInstance();
   return rb.GetNativeImageNamed(resource_id);
 }
 
 // static
@@ skipping 53 matching lines @@
 }
 
 // static
 const gfx::Image& WebsiteSettingsUI::GetFirstVisitIcon(
     const string16& first_visit) {
   // FIXME(markusheintz): Display a minor warning icon if the page is visited
   // the first time.
   ResourceBundle& rb = ResourceBundle::GetSharedInstance();
   return rb.GetNativeImageNamed(IDR_PAGEINFO_INFO);
 }