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

Side by Side Diff: chrome/browser/ui/website_settings/website_settings_ui.cc

Issue 10836029: Use the correct cookies icon on the WebsiteSettingsUI (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 4 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/ui/website_settings/website_settings_ui.h" 5 #include "chrome/browser/ui/website_settings/website_settings_ui.h"
6 6
7 #include "grit/generated_resources.h" 7 #include "grit/generated_resources.h"
8 #include "grit/theme_resources.h" 8 #include "grit/theme_resources.h"
9 #include "grit/ui_resources.h" 9 #include "grit/ui_resources.h"
10 #include "ui/base/l10n/l10n_util.h" 10 #include "ui/base/l10n/l10n_util.h"
(...skipping 121 matching lines...) Expand 10 before | Expand all | Expand 10 after
132 case CONTENT_SETTINGS_TYPE_IMAGES: 132 case CONTENT_SETTINGS_TYPE_IMAGES:
133 resource_id = use_blocked ? IDR_BLOCKED_IMAGES 133 resource_id = use_blocked ? IDR_BLOCKED_IMAGES
134 : IDR_ALLOWED_IMAGES; 134 : IDR_ALLOWED_IMAGES;
135 break; 135 break;
136 case CONTENT_SETTINGS_TYPE_JAVASCRIPT: 136 case CONTENT_SETTINGS_TYPE_JAVASCRIPT:
137 resource_id = use_blocked ? IDR_BLOCKED_JAVASCRIPT 137 resource_id = use_blocked ? IDR_BLOCKED_JAVASCRIPT
138 : IDR_ALLOWED_JAVASCRIPT; 138 : IDR_ALLOWED_JAVASCRIPT;
139 break; 139 break;
140 case CONTENT_SETTINGS_TYPE_COOKIES: 140 case CONTENT_SETTINGS_TYPE_COOKIES:
141 resource_id = use_blocked ? IDR_BLOCKED_COOKIES 141 resource_id = use_blocked ? IDR_BLOCKED_COOKIES
142 : IDR_COOKIE_ICON; 142 : IDR_ACCESSED_COOKIES;
143 break; 143 break;
144 case CONTENT_SETTINGS_TYPE_POPUPS: 144 case CONTENT_SETTINGS_TYPE_POPUPS:
145 resource_id = use_blocked ? IDR_BLOCKED_POPUPS 145 resource_id = use_blocked ? IDR_BLOCKED_POPUPS
146 : IDR_ALLOWED_POPUPS; 146 : IDR_ALLOWED_POPUPS;
147 break; 147 break;
148 case CONTENT_SETTINGS_TYPE_PLUGINS: 148 case CONTENT_SETTINGS_TYPE_PLUGINS:
149 resource_id = use_blocked ? IDR_BLOCKED_PLUGINS 149 resource_id = use_blocked ? IDR_BLOCKED_PLUGINS
150 : IDR_ALLOWED_PLUGINS; 150 : IDR_ALLOWED_PLUGINS;
151 break; 151 break;
152 case CONTENT_SETTINGS_TYPE_GEOLOCATION: 152 case CONTENT_SETTINGS_TYPE_GEOLOCATION:
(...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after
233 } 233 }
234 234
235 // static 235 // static
236 const gfx::Image& WebsiteSettingsUI::GetFirstVisitIcon( 236 const gfx::Image& WebsiteSettingsUI::GetFirstVisitIcon(
237 const string16& first_visit) { 237 const string16& first_visit) {
238 // FIXME(markusheintz): Display a minor warning icon if the page is visited 238 // FIXME(markusheintz): Display a minor warning icon if the page is visited
239 // the first time. 239 // the first time.
240 ResourceBundle& rb = ResourceBundle::GetSharedInstance(); 240 ResourceBundle& rb = ResourceBundle::GetSharedInstance();
241 return rb.GetNativeImageNamed(IDR_PAGEINFO_INFO); 241 return rb.GetNativeImageNamed(IDR_PAGEINFO_INFO);
242 } 242 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698