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

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

Issue 27635002: Content settings for <audio> and <video>. Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Test fix. Created 6 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 unified diff | Download patch
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 93 matching lines...) Expand 10 before | Expand all | Expand 10 after
104 } 104 }
105 105
106 // static 106 // static
107 base::string16 WebsiteSettingsUI::PermissionTypeToUIString( 107 base::string16 WebsiteSettingsUI::PermissionTypeToUIString(
108 ContentSettingsType type) { 108 ContentSettingsType type) {
109 switch (type) { 109 switch (type) {
110 case CONTENT_SETTINGS_TYPE_IMAGES: 110 case CONTENT_SETTINGS_TYPE_IMAGES:
111 return l10n_util::GetStringUTF16(IDS_WEBSITE_SETTINGS_TYPE_IMAGES); 111 return l10n_util::GetStringUTF16(IDS_WEBSITE_SETTINGS_TYPE_IMAGES);
112 case CONTENT_SETTINGS_TYPE_JAVASCRIPT: 112 case CONTENT_SETTINGS_TYPE_JAVASCRIPT:
113 return l10n_util::GetStringUTF16(IDS_WEBSITE_SETTINGS_TYPE_JAVASCRIPT); 113 return l10n_util::GetStringUTF16(IDS_WEBSITE_SETTINGS_TYPE_JAVASCRIPT);
114 case CONTENT_SETTINGS_TYPE_MEDIA:
115 return l10n_util::GetStringUTF16(IDS_WEBSITE_SETTINGS_TYPE_MEDIA);
114 case CONTENT_SETTINGS_TYPE_POPUPS: 116 case CONTENT_SETTINGS_TYPE_POPUPS:
115 return l10n_util::GetStringUTF16(IDS_WEBSITE_SETTINGS_TYPE_POPUPS); 117 return l10n_util::GetStringUTF16(IDS_WEBSITE_SETTINGS_TYPE_POPUPS);
116 case CONTENT_SETTINGS_TYPE_PLUGINS: 118 case CONTENT_SETTINGS_TYPE_PLUGINS:
117 return l10n_util::GetStringUTF16(IDS_WEBSITE_SETTINGS_TYPE_PLUGINS); 119 return l10n_util::GetStringUTF16(IDS_WEBSITE_SETTINGS_TYPE_PLUGINS);
118 case CONTENT_SETTINGS_TYPE_GEOLOCATION: 120 case CONTENT_SETTINGS_TYPE_GEOLOCATION:
119 return l10n_util::GetStringUTF16(IDS_WEBSITE_SETTINGS_TYPE_LOCATION); 121 return l10n_util::GetStringUTF16(IDS_WEBSITE_SETTINGS_TYPE_LOCATION);
120 case CONTENT_SETTINGS_TYPE_NOTIFICATIONS: 122 case CONTENT_SETTINGS_TYPE_NOTIFICATIONS:
121 return l10n_util::GetStringUTF16( 123 return l10n_util::GetStringUTF16(
122 IDS_WEBSITE_SETTINGS_TYPE_NOTIFICATIONS); 124 IDS_WEBSITE_SETTINGS_TYPE_NOTIFICATIONS);
123 case CONTENT_SETTINGS_TYPE_FULLSCREEN: 125 case CONTENT_SETTINGS_TYPE_FULLSCREEN:
(...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after
192 bool use_blocked = (setting == CONTENT_SETTING_BLOCK); 194 bool use_blocked = (setting == CONTENT_SETTING_BLOCK);
193 int resource_id = IDR_INFO; 195 int resource_id = IDR_INFO;
194 switch (type) { 196 switch (type) {
195 case CONTENT_SETTINGS_TYPE_IMAGES: 197 case CONTENT_SETTINGS_TYPE_IMAGES:
196 resource_id = use_blocked ? IDR_BLOCKED_IMAGES : IDR_ALLOWED_IMAGES; 198 resource_id = use_blocked ? IDR_BLOCKED_IMAGES : IDR_ALLOWED_IMAGES;
197 break; 199 break;
198 case CONTENT_SETTINGS_TYPE_JAVASCRIPT: 200 case CONTENT_SETTINGS_TYPE_JAVASCRIPT:
199 resource_id = 201 resource_id =
200 use_blocked ? IDR_BLOCKED_JAVASCRIPT : IDR_ALLOWED_JAVASCRIPT; 202 use_blocked ? IDR_BLOCKED_JAVASCRIPT : IDR_ALLOWED_JAVASCRIPT;
201 break; 203 break;
204 case CONTENT_SETTINGS_TYPE_MEDIA:
205 resource_id = use_blocked ? IDR_BLOCKED_MEDIA : IDR_ALLOWED_MEDIA;
206 break;
202 case CONTENT_SETTINGS_TYPE_COOKIES: 207 case CONTENT_SETTINGS_TYPE_COOKIES:
203 resource_id = use_blocked ? IDR_BLOCKED_COOKIES : IDR_ACCESSED_COOKIES; 208 resource_id = use_blocked ? IDR_BLOCKED_COOKIES : IDR_ACCESSED_COOKIES;
204 break; 209 break;
205 case CONTENT_SETTINGS_TYPE_POPUPS: 210 case CONTENT_SETTINGS_TYPE_POPUPS:
206 resource_id = use_blocked ? IDR_BLOCKED_POPUPS : IDR_ALLOWED_POPUPS; 211 resource_id = use_blocked ? IDR_BLOCKED_POPUPS : IDR_ALLOWED_POPUPS;
207 break; 212 break;
208 case CONTENT_SETTINGS_TYPE_PLUGINS: 213 case CONTENT_SETTINGS_TYPE_PLUGINS:
209 resource_id = use_blocked ? IDR_BLOCKED_PLUGINS : IDR_ALLOWED_PLUGINS; 214 resource_id = use_blocked ? IDR_BLOCKED_PLUGINS : IDR_ALLOWED_PLUGINS;
210 break; 215 break;
211 case CONTENT_SETTINGS_TYPE_GEOLOCATION: 216 case CONTENT_SETTINGS_TYPE_GEOLOCATION:
(...skipping 114 matching lines...) Expand 10 before | Expand all | Expand 10 after
326 // the first time. 331 // the first time.
327 return IDR_PAGEINFO_INFO; 332 return IDR_PAGEINFO_INFO;
328 } 333 }
329 334
330 // static 335 // static
331 const gfx::Image& WebsiteSettingsUI::GetFirstVisitIcon( 336 const gfx::Image& WebsiteSettingsUI::GetFirstVisitIcon(
332 const base::string16& first_visit) { 337 const base::string16& first_visit) {
333 ResourceBundle& rb = ResourceBundle::GetSharedInstance(); 338 ResourceBundle& rb = ResourceBundle::GetSharedInstance();
334 return rb.GetNativeImageNamed(GetFirstVisitIconID(first_visit)); 339 return rb.GetNativeImageNamed(GetFirstVisitIconID(first_visit));
335 } 340 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698