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

Side by Side Diff: chrome/browser/ui/content_settings/content_setting_image_model.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/content_settings/content_setting_image_model.h" 5 #include "chrome/browser/ui/content_settings/content_setting_image_model.h"
6 6
7 #include "chrome/browser/content_settings/host_content_settings_map.h" 7 #include "chrome/browser/content_settings/host_content_settings_map.h"
8 #include "chrome/browser/content_settings/tab_specific_content_settings.h" 8 #include "chrome/browser/content_settings/tab_specific_content_settings.h"
9 #include "chrome/browser/prerender/prerender_manager.h" 9 #include "chrome/browser/prerender/prerender_manager.h"
10 #include "chrome/browser/profiles/profile.h" 10 #include "chrome/browser/profiles/profile.h"
(...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after
86 void ContentSettingBlockedImageModel::UpdateFromWebContents( 86 void ContentSettingBlockedImageModel::UpdateFromWebContents(
87 WebContents* web_contents) { 87 WebContents* web_contents) {
88 set_visible(false); 88 set_visible(false);
89 if (!web_contents) 89 if (!web_contents)
90 return; 90 return;
91 91
92 static const ContentSettingsTypeIdEntry kBlockedIconIDs[] = { 92 static const ContentSettingsTypeIdEntry kBlockedIconIDs[] = {
93 {CONTENT_SETTINGS_TYPE_COOKIES, IDR_BLOCKED_COOKIES}, 93 {CONTENT_SETTINGS_TYPE_COOKIES, IDR_BLOCKED_COOKIES},
94 {CONTENT_SETTINGS_TYPE_IMAGES, IDR_BLOCKED_IMAGES}, 94 {CONTENT_SETTINGS_TYPE_IMAGES, IDR_BLOCKED_IMAGES},
95 {CONTENT_SETTINGS_TYPE_JAVASCRIPT, IDR_BLOCKED_JAVASCRIPT}, 95 {CONTENT_SETTINGS_TYPE_JAVASCRIPT, IDR_BLOCKED_JAVASCRIPT},
96 {CONTENT_SETTINGS_TYPE_MEDIA, IDR_BLOCKED_MEDIA},
96 {CONTENT_SETTINGS_TYPE_PLUGINS, IDR_BLOCKED_PLUGINS}, 97 {CONTENT_SETTINGS_TYPE_PLUGINS, IDR_BLOCKED_PLUGINS},
97 {CONTENT_SETTINGS_TYPE_POPUPS, IDR_BLOCKED_POPUPS}, 98 {CONTENT_SETTINGS_TYPE_POPUPS, IDR_BLOCKED_POPUPS},
98 {CONTENT_SETTINGS_TYPE_MIXEDSCRIPT, IDR_BLOCKED_MIXED_CONTENT}, 99 {CONTENT_SETTINGS_TYPE_MIXEDSCRIPT, IDR_BLOCKED_MIXED_CONTENT},
99 {CONTENT_SETTINGS_TYPE_PPAPI_BROKER, IDR_BLOCKED_PPAPI_BROKER}, 100 {CONTENT_SETTINGS_TYPE_PPAPI_BROKER, IDR_BLOCKED_PPAPI_BROKER},
100 {CONTENT_SETTINGS_TYPE_AUTOMATIC_DOWNLOADS, IDR_BLOCKED_DOWNLOADS}, 101 {CONTENT_SETTINGS_TYPE_AUTOMATIC_DOWNLOADS, IDR_BLOCKED_DOWNLOADS},
101 }; 102 };
102 static const ContentSettingsTypeIdEntry kBlockedTooltipIDs[] = { 103 static const ContentSettingsTypeIdEntry kBlockedTooltipIDs[] = {
103 {CONTENT_SETTINGS_TYPE_COOKIES, IDS_BLOCKED_COOKIES_TITLE}, 104 {CONTENT_SETTINGS_TYPE_COOKIES, IDS_BLOCKED_COOKIES_TITLE},
104 {CONTENT_SETTINGS_TYPE_IMAGES, IDS_BLOCKED_IMAGES_TITLE}, 105 {CONTENT_SETTINGS_TYPE_IMAGES, IDS_BLOCKED_IMAGES_TITLE},
105 {CONTENT_SETTINGS_TYPE_JAVASCRIPT, IDS_BLOCKED_JAVASCRIPT_TITLE}, 106 {CONTENT_SETTINGS_TYPE_JAVASCRIPT, IDS_BLOCKED_JAVASCRIPT_TITLE},
107 {CONTENT_SETTINGS_TYPE_MEDIA, IDS_BLOCKED_MEDIA_TITLE},
106 {CONTENT_SETTINGS_TYPE_PLUGINS, IDS_BLOCKED_PLUGINS_MESSAGE}, 108 {CONTENT_SETTINGS_TYPE_PLUGINS, IDS_BLOCKED_PLUGINS_MESSAGE},
107 {CONTENT_SETTINGS_TYPE_POPUPS, IDS_BLOCKED_POPUPS_TOOLTIP}, 109 {CONTENT_SETTINGS_TYPE_POPUPS, IDS_BLOCKED_POPUPS_TOOLTIP},
108 {CONTENT_SETTINGS_TYPE_MIXEDSCRIPT, 110 {CONTENT_SETTINGS_TYPE_MIXEDSCRIPT,
109 IDS_BLOCKED_DISPLAYING_INSECURE_CONTENT}, 111 IDS_BLOCKED_DISPLAYING_INSECURE_CONTENT},
110 {CONTENT_SETTINGS_TYPE_PPAPI_BROKER, IDS_BLOCKED_PPAPI_BROKER_TITLE}, 112 {CONTENT_SETTINGS_TYPE_PPAPI_BROKER, IDS_BLOCKED_PPAPI_BROKER_TITLE},
111 {CONTENT_SETTINGS_TYPE_AUTOMATIC_DOWNLOADS, IDS_BLOCKED_DOWNLOAD_TITLE}, 113 {CONTENT_SETTINGS_TYPE_AUTOMATIC_DOWNLOADS, IDS_BLOCKED_DOWNLOAD_TITLE},
112 }; 114 };
113 static const ContentSettingsTypeIdEntry kBlockedExplanatoryTextIDs[] = { 115 static const ContentSettingsTypeIdEntry kBlockedExplanatoryTextIDs[] = {
114 {CONTENT_SETTINGS_TYPE_POPUPS, IDS_BLOCKED_POPUPS_EXPLANATORY_TEXT}, 116 {CONTENT_SETTINGS_TYPE_POPUPS, IDS_BLOCKED_POPUPS_EXPLANATORY_TEXT},
115 {CONTENT_SETTINGS_TYPE_PLUGINS, IDS_BLOCKED_PLUGIN_EXPLANATORY_TEXT}, 117 {CONTENT_SETTINGS_TYPE_PLUGINS, IDS_BLOCKED_PLUGIN_EXPLANATORY_TEXT},
(...skipping 143 matching lines...) Expand 10 before | Expand all | Expand 10 after
259 break; 261 break;
260 case TabSpecificContentSettings::CAMERA_ACCESSED: 262 case TabSpecificContentSettings::CAMERA_ACCESSED:
261 set_icon(IDR_ASK_MEDIA); 263 set_icon(IDR_ASK_MEDIA);
262 set_tooltip(l10n_util::GetStringUTF8(IDS_CAMERA_ACCESSED)); 264 set_tooltip(l10n_util::GetStringUTF8(IDS_CAMERA_ACCESSED));
263 break; 265 break;
264 case TabSpecificContentSettings::MICROPHONE_CAMERA_ACCESSED: 266 case TabSpecificContentSettings::MICROPHONE_CAMERA_ACCESSED:
265 set_icon(IDR_ASK_MEDIA); 267 set_icon(IDR_ASK_MEDIA);
266 set_tooltip(l10n_util::GetStringUTF8(IDS_MICROPHONE_CAMERA_ALLOWED)); 268 set_tooltip(l10n_util::GetStringUTF8(IDS_MICROPHONE_CAMERA_ALLOWED));
267 break; 269 break;
268 case TabSpecificContentSettings::MICROPHONE_BLOCKED: 270 case TabSpecificContentSettings::MICROPHONE_BLOCKED:
269 set_icon(IDR_BLOCKED_MEDIA); 271 set_icon(IDR_BLOCKED_MEDIASTREAM);
270 set_tooltip(l10n_util::GetStringUTF8(IDS_MICROPHONE_BLOCKED)); 272 set_tooltip(l10n_util::GetStringUTF8(IDS_MICROPHONE_BLOCKED));
271 break; 273 break;
272 case TabSpecificContentSettings::CAMERA_BLOCKED: 274 case TabSpecificContentSettings::CAMERA_BLOCKED:
273 set_icon(IDR_BLOCKED_MEDIA); 275 set_icon(IDR_BLOCKED_MEDIASTREAM);
274 set_tooltip(l10n_util::GetStringUTF8(IDS_CAMERA_BLOCKED)); 276 set_tooltip(l10n_util::GetStringUTF8(IDS_CAMERA_BLOCKED));
275 break; 277 break;
276 case TabSpecificContentSettings::MICROPHONE_CAMERA_BLOCKED: 278 case TabSpecificContentSettings::MICROPHONE_CAMERA_BLOCKED:
277 set_icon(IDR_BLOCKED_MEDIA); 279 set_icon(IDR_BLOCKED_MEDIASTREAM);
278 set_tooltip(l10n_util::GetStringUTF8(IDS_MICROPHONE_CAMERA_BLOCKED)); 280 set_tooltip(l10n_util::GetStringUTF8(IDS_MICROPHONE_CAMERA_BLOCKED));
279 break; 281 break;
280 } 282 }
281 set_visible(true); 283 set_visible(true);
282 } 284 }
283 285
284 ContentSettingRPHImageModel::ContentSettingRPHImageModel() 286 ContentSettingRPHImageModel::ContentSettingRPHImageModel()
285 : ContentSettingImageModel( 287 : ContentSettingImageModel(
286 CONTENT_SETTINGS_TYPE_PROTOCOL_HANDLERS) { 288 CONTENT_SETTINGS_TYPE_PROTOCOL_HANDLERS) {
287 set_icon(IDR_REGISTER_PROTOCOL_HANDLER); 289 set_icon(IDR_REGISTER_PROTOCOL_HANDLER);
(...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after
366 case CONTENT_SETTINGS_TYPE_MEDIASTREAM: 368 case CONTENT_SETTINGS_TYPE_MEDIASTREAM:
367 case CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC: 369 case CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC:
368 case CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA: 370 case CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA:
369 return new ContentSettingMediaImageModel(content_settings_type); 371 return new ContentSettingMediaImageModel(content_settings_type);
370 case CONTENT_SETTINGS_TYPE_MIDI_SYSEX: 372 case CONTENT_SETTINGS_TYPE_MIDI_SYSEX:
371 return new ContentSettingMIDISysExImageModel(); 373 return new ContentSettingMIDISysExImageModel();
372 default: 374 default:
373 return new ContentSettingBlockedImageModel(content_settings_type); 375 return new ContentSettingBlockedImageModel(content_settings_type);
374 } 376 }
375 } 377 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698