Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(7935)

Unified Diff: chrome/browser/ui/website_settings/website_settings_ui.cc

Issue 10828002: (Views only) Replace the content settings icons on the Website Settings UI with the new icons. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase on tot. Created 8 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/app/theme/theme_resources.grd ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/website_settings/website_settings_ui.cc
diff --git a/chrome/browser/ui/website_settings/website_settings_ui.cc b/chrome/browser/ui/website_settings/website_settings_ui.cc
index 3b7c00d1d1e7b4c028acd6530b287072c03d11bb..b94bb29702c8574bc5de4160f96303f3aa589817 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();
« no previous file with comments | « chrome/app/theme/theme_resources.grd ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698