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

Side by Side Diff: chrome/browser/ui/content_settings/content_setting_bubble_model.cc

Issue 12086077: Only permit plug-in loads in the browser if the plug-in isn't blocked or the (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 7 years, 10 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
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_bubble_model.h" 5 #include "chrome/browser/ui/content_settings/content_setting_bubble_model.h"
6 6
7 #include "base/utf_string_conversions.h" 7 #include "base/utf_string_conversions.h"
8 #include "chrome/browser/api/infobars/infobar_service.h" 8 #include "chrome/browser/api/infobars/infobar_service.h"
9 #include "chrome/browser/content_settings/content_settings_utils.h" 9 #include "chrome/browser/content_settings/content_settings_utils.h"
10 #include "chrome/browser/content_settings/cookie_settings.h" 10 #include "chrome/browser/content_settings/cookie_settings.h"
11 #include "chrome/browser/content_settings/tab_specific_content_settings.h" 11 #include "chrome/browser/content_settings/tab_specific_content_settings.h"
12 #include "chrome/browser/custom_handlers/protocol_handler_registry.h" 12 #include "chrome/browser/custom_handlers/protocol_handler_registry.h"
13 #include "chrome/browser/custom_handlers/protocol_handler_registry_factory.h" 13 #include "chrome/browser/custom_handlers/protocol_handler_registry_factory.h"
14 #include "chrome/browser/favicon/favicon_tab_helper.h" 14 #include "chrome/browser/favicon/favicon_tab_helper.h"
15 #include "chrome/browser/plugins/chrome_plugin_service_filter.h"
15 #include "chrome/browser/prefs/pref_service.h" 16 #include "chrome/browser/prefs/pref_service.h"
16 #include "chrome/browser/profiles/profile.h" 17 #include "chrome/browser/profiles/profile.h"
17 #include "chrome/browser/ui/blocked_content/blocked_content_tab_helper.h" 18 #include "chrome/browser/ui/blocked_content/blocked_content_tab_helper.h"
18 #include "chrome/browser/ui/blocked_content/blocked_content_tab_helper_delegate. h" 19 #include "chrome/browser/ui/blocked_content/blocked_content_tab_helper_delegate. h"
19 #include "chrome/browser/ui/collected_cookies_infobar_delegate.h" 20 #include "chrome/browser/ui/collected_cookies_infobar_delegate.h"
20 #include "chrome/browser/ui/content_settings/content_setting_bubble_model_delega te.h" 21 #include "chrome/browser/ui/content_settings/content_setting_bubble_model_delega te.h"
21 #include "chrome/common/chrome_notification_types.h" 22 #include "chrome/common/chrome_notification_types.h"
22 #include "chrome/common/content_settings.h" 23 #include "chrome/common/content_settings.h"
23 #include "chrome/common/pref_names.h" 24 #include "chrome/common/pref_names.h"
24 #include "chrome/common/render_messages.h" 25 #include "chrome/common/render_messages.h"
25 #include "content/public/browser/notification_service.h" 26 #include "content/public/browser/notification_service.h"
27 #include "content/public/browser/render_process_host.h"
26 #include "content/public/browser/render_view_host.h" 28 #include "content/public/browser/render_view_host.h"
27 #include "content/public/browser/user_metrics.h" 29 #include "content/public/browser/user_metrics.h"
28 #include "content/public/browser/web_contents.h" 30 #include "content/public/browser/web_contents.h"
29 #include "content/public/browser/web_contents_delegate.h" 31 #include "content/public/browser/web_contents_delegate.h"
30 #include "grit/generated_resources.h" 32 #include "grit/generated_resources.h"
31 #include "net/base/net_util.h" 33 #include "net/base/net_util.h"
32 #include "ui/base/l10n/l10n_util.h" 34 #include "ui/base/l10n/l10n_util.h"
33 35
34 using content::UserMetricsAction; 36 using content::UserMetricsAction;
35 using content::WebContents; 37 using content::WebContents;
(...skipping 353 matching lines...) Expand 10 before | Expand all | Expand 10 after
389 if (!web_contents()) 391 if (!web_contents())
390 return; 392 return;
391 content::NotificationService::current()->Notify( 393 content::NotificationService::current()->Notify(
392 chrome::NOTIFICATION_COLLECTED_COOKIES_SHOWN, 394 chrome::NOTIFICATION_COLLECTED_COOKIES_SHOWN,
393 content::Source<TabSpecificContentSettings>( 395 content::Source<TabSpecificContentSettings>(
394 TabSpecificContentSettings::FromWebContents(web_contents())), 396 TabSpecificContentSettings::FromWebContents(web_contents())),
395 content::NotificationService::NoDetails()); 397 content::NotificationService::NoDetails());
396 delegate()->ShowCollectedCookiesDialog(web_contents()); 398 delegate()->ShowCollectedCookiesDialog(web_contents());
397 } 399 }
398 400
401 #if defined(ENABLE_PLUGINS)
402
399 class ContentSettingPluginBubbleModel : public ContentSettingSingleRadioGroup { 403 class ContentSettingPluginBubbleModel : public ContentSettingSingleRadioGroup {
400 public: 404 public:
401 ContentSettingPluginBubbleModel(Delegate* delegate, 405 ContentSettingPluginBubbleModel(Delegate* delegate,
402 WebContents* web_contents, 406 WebContents* web_contents,
403 Profile* profile, 407 Profile* profile,
404 ContentSettingsType content_type); 408 ContentSettingsType content_type);
405 409
406 virtual ~ContentSettingPluginBubbleModel() {} 410 virtual ~ContentSettingPluginBubbleModel() {}
407 411
408 private: 412 private:
(...skipping 11 matching lines...) Expand all
420 set_custom_link_enabled(web_contents && 424 set_custom_link_enabled(web_contents &&
421 TabSpecificContentSettings::FromWebContents( 425 TabSpecificContentSettings::FromWebContents(
422 web_contents)->load_plugins_link_enabled()); 426 web_contents)->load_plugins_link_enabled());
423 } 427 }
424 428
425 void ContentSettingPluginBubbleModel::OnCustomLinkClicked() { 429 void ContentSettingPluginBubbleModel::OnCustomLinkClicked() {
426 content::RecordAction(UserMetricsAction("ClickToPlay_LoadAll_Bubble")); 430 content::RecordAction(UserMetricsAction("ClickToPlay_LoadAll_Bubble"));
427 DCHECK(web_contents()); 431 DCHECK(web_contents());
428 content::RenderViewHost* host = web_contents()->GetRenderViewHost(); 432 content::RenderViewHost* host = web_contents()->GetRenderViewHost();
429 // TODO(bauerb): We should send the identifiers of blocked plug-ins here. 433 // TODO(bauerb): We should send the identifiers of blocked plug-ins here.
434 ChromePluginServiceFilter::GetInstance()->AuthorizeAllPlugins(
435 host->GetProcess()->GetID());
430 host->Send(new ChromeViewMsg_LoadBlockedPlugins(host->GetRoutingID(), 436 host->Send(new ChromeViewMsg_LoadBlockedPlugins(host->GetRoutingID(),
431 std::string())); 437 std::string()));
432 set_custom_link_enabled(false); 438 set_custom_link_enabled(false);
433 TabSpecificContentSettings::FromWebContents(web_contents())-> 439 TabSpecificContentSettings::FromWebContents(web_contents())->
434 set_load_plugins_link_enabled(false); 440 set_load_plugins_link_enabled(false);
435 } 441 }
436 442
443 #endif // ENABLE_PLUGINS
444
437 class ContentSettingPopupBubbleModel : public ContentSettingSingleRadioGroup { 445 class ContentSettingPopupBubbleModel : public ContentSettingSingleRadioGroup {
438 public: 446 public:
439 ContentSettingPopupBubbleModel(Delegate* delegate, 447 ContentSettingPopupBubbleModel(Delegate* delegate,
440 WebContents* web_contents, 448 WebContents* web_contents,
441 Profile* profile, 449 Profile* profile,
442 ContentSettingsType content_type); 450 ContentSettingsType content_type);
443 virtual ~ContentSettingPopupBubbleModel() {} 451 virtual ~ContentSettingPopupBubbleModel() {}
444 452
445 private: 453 private:
446 void SetPopups(); 454 void SetPopups();
(...skipping 436 matching lines...) Expand 10 before | Expand all | Expand 10 after
883 content_type); 891 content_type);
884 } 892 }
885 if (content_type == CONTENT_SETTINGS_TYPE_GEOLOCATION) { 893 if (content_type == CONTENT_SETTINGS_TYPE_GEOLOCATION) {
886 return new ContentSettingDomainListBubbleModel(delegate, web_contents, 894 return new ContentSettingDomainListBubbleModel(delegate, web_contents,
887 profile, content_type); 895 profile, content_type);
888 } 896 }
889 if (content_type == CONTENT_SETTINGS_TYPE_MEDIASTREAM) { 897 if (content_type == CONTENT_SETTINGS_TYPE_MEDIASTREAM) {
890 return new ContentSettingMediaStreamBubbleModel(delegate, web_contents, 898 return new ContentSettingMediaStreamBubbleModel(delegate, web_contents,
891 profile); 899 profile);
892 } 900 }
901 #if defined(ENABLE_PLUGINS)
893 if (content_type == CONTENT_SETTINGS_TYPE_PLUGINS) { 902 if (content_type == CONTENT_SETTINGS_TYPE_PLUGINS) {
894 return new ContentSettingPluginBubbleModel(delegate, web_contents, profile, 903 return new ContentSettingPluginBubbleModel(delegate, web_contents, profile,
895 content_type); 904 content_type);
896 } 905 }
906 #endif
897 if (content_type == CONTENT_SETTINGS_TYPE_MIXEDSCRIPT) { 907 if (content_type == CONTENT_SETTINGS_TYPE_MIXEDSCRIPT) {
898 return new ContentSettingMixedScriptBubbleModel(delegate, web_contents, 908 return new ContentSettingMixedScriptBubbleModel(delegate, web_contents,
899 profile, content_type); 909 profile, content_type);
900 } 910 }
901 if (content_type == CONTENT_SETTINGS_TYPE_PROTOCOL_HANDLERS) { 911 if (content_type == CONTENT_SETTINGS_TYPE_PROTOCOL_HANDLERS) {
902 ProtocolHandlerRegistry* registry = 912 ProtocolHandlerRegistry* registry =
903 ProtocolHandlerRegistryFactory::GetForProfile(profile); 913 ProtocolHandlerRegistryFactory::GetForProfile(profile);
904 return new ContentSettingRPHBubbleModel(delegate, web_contents, profile, 914 return new ContentSettingRPHBubbleModel(delegate, web_contents, profile,
905 registry, content_type); 915 registry, content_type);
906 } 916 }
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
952 if (type == content::NOTIFICATION_WEB_CONTENTS_DESTROYED) { 962 if (type == content::NOTIFICATION_WEB_CONTENTS_DESTROYED) {
953 DCHECK_EQ(web_contents_, 963 DCHECK_EQ(web_contents_,
954 content::Source<WebContents>(source).ptr()); 964 content::Source<WebContents>(source).ptr());
955 web_contents_ = NULL; 965 web_contents_ = NULL;
956 } else { 966 } else {
957 DCHECK_EQ(chrome::NOTIFICATION_PROFILE_DESTROYED, type); 967 DCHECK_EQ(chrome::NOTIFICATION_PROFILE_DESTROYED, type);
958 DCHECK_EQ(profile_, content::Source<Profile>(source).ptr()); 968 DCHECK_EQ(profile_, content::Source<Profile>(source).ptr());
959 profile_ = NULL; 969 profile_ = NULL;
960 } 970 }
961 } 971 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698