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

BUG=113688
TEST=none

Review URL: https://chromiumcodereview.appspot.com/10828002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@148461 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 26 insertions, 5 deletions

diff --git a/chrome/app/theme/theme_resources.grd b/chrome/app/theme/theme_resources.grd
index 397eb0c..4e56bd6 100644
--- a/chrome/app/theme/theme_resources.grd
+++ b/chrome/app/theme/theme_resources.grd
@@ -22,11 +22,19 @@
       </if>
       <structure type="chrome_scaled_image" name="IDR_ACTION_BOX_BUTTON" file="action_box_button.png" />
       <structure type="chrome_scaled_image" name="IDR_ACTION_BOX_BUTTON_PRESSED" file="action_box_button_pressed.png" />
+      <structure type="chrome_scaled_image" name="IDR_ALLOWED_FULLSCREEN" file="allowed_fullscreen.png" />
+      <structure type="chrome_scaled_image" name="IDR_ALLOWED_IMAGES" file="allowed_images.png" />
+      <structure type="chrome_scaled_image" name="IDR_ALLOWED_MOUSE_CURSOR" file="allowed_mouse_cursor.png" />
+      <structure type="chrome_scaled_image" name="IDR_ALLOWED_NOTIFICATION" file="allowed_notifications.png" />
+      <structure type="chrome_scaled_image" name="IDR_ALLOWED_POPUPS" file="allowed_popups.png" />
+      <structure type="chrome_scaled_image" name="IDR_ALLOWED_PLUGINS" file="allowed_plugins.png" />
+      <structure type="chrome_scaled_image" name="IDR_ALLOWED_JAVASCRIPT" file="allowed_script.png" />
       <structure type="chrome_scaled_image" name="IDR_APP_DEFAULT_ICON" file="app_default_icon.png" />
       <structure type="chrome_scaled_image" name="IDR_APP_DROPARROW" file="app_droparrow.png" />
       <structure type="chrome_scaled_image" name="IDR_APP_NOTIFICATION_NUB" file="nub.png" />
       <structure type="chrome_scaled_image" name="IDR_APP_NOTIFICATION_NUB_MASK" file="nub_mask.png" />
       <structure type="chrome_scaled_image" name="IDR_APP_NOTIFICATION_SMALL_BUBBLE" file="small_bubble.png" />
+      <structure type="chrome_scaled_image" name="IDR_ASK_MEDIA" file="ask_media.png" />
       <if expr="not pp_ifdef('toolkit_views')">
         <structure type="chrome_scaled_image" name="IDR_BACK" file="back.png" />
         <structure type="chrome_scaled_image" name="IDR_BACK_D" file="back_disabled.png" />
@@ -47,9 +55,13 @@
       <structure type="chrome_scaled_image" name="IDR_BALLOON_WRENCH_H" file="notification_wrench_hover.png" />
       <structure type="chrome_scaled_image" name="IDR_BALLOON_WRENCH_P" file="notification_wrench_pressed.png" />
       <structure type="chrome_scaled_image" name="IDR_BLOCKED_COOKIES" file="blocked_cookies.png" />
+      <structure type="chrome_scaled_image" name="IDR_BLOCKED_FULLSCREEN" file="blocked_fullscreen.png" />
       <structure type="chrome_scaled_image" name="IDR_BLOCKED_IMAGES" file="blocked_images.png" />
       <structure type="chrome_scaled_image" name="IDR_BLOCKED_JAVASCRIPT" file="blocked_script.png" />
+      <structure type="chrome_scaled_image" name="IDR_BLOCKED_MEDIA" file="blocked_media.png" />
+      <structure type="chrome_scaled_image" name="IDR_BLOCKED_MOUSE_CURSOR" file="blocked_mouse_cursor.png" />
       <structure type="chrome_scaled_image" name="IDR_BLOCKED_MIXED_CONTENT" file="blocked_mixed_content.png" />
+      <structure type="chrome_scaled_image" name="IDR_BLOCKED_NOTIFICATION" file="blocked_notifications.png" />
       <structure type="chrome_scaled_image" name="IDR_BLOCKED_PLUGINS" file="blocked_plugins.png" />
       <structure type="chrome_scaled_image" name="IDR_BLOCKED_POPUPS" file="blocked_popups.png" />
       <structure type="chrome_scaled_image" name="IDR_BOOKMARKS_FAVICON" file="bookmarks_favicon.png" />
diff --git a/chrome/browser/ui/website_settings/website_settings_ui.cc b/chrome/browser/ui/website_settings/website_settings_ui.cc
index 3b7c00d..b94bb29 100644
--- a/chrome/browser/ui/website_settings/website_settings_ui.cc
+++ b/chrome/browser/ui/website_settings/website_settings_ui.cc
@@ -131,11 +131,11 @@ const gfx::Image& WebsiteSettingsUI::GetPermissionIcon(
   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
@@ -143,21 +143,30 @@ const gfx::Image& WebsiteSettingsUI::GetPermissionIcon(
       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();