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

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 384 matching lines...) Expand 10 before | Expand all | Expand 10 after
420 set_custom_link_enabled(web_contents && 422 set_custom_link_enabled(web_contents &&
421 TabSpecificContentSettings::FromWebContents( 423 TabSpecificContentSettings::FromWebContents(
422 web_contents)->load_plugins_link_enabled()); 424 web_contents)->load_plugins_link_enabled());
423 } 425 }
424 426
425 void ContentSettingPluginBubbleModel::OnCustomLinkClicked() { 427 void ContentSettingPluginBubbleModel::OnCustomLinkClicked() {
426 content::RecordAction(UserMetricsAction("ClickToPlay_LoadAll_Bubble")); 428 content::RecordAction(UserMetricsAction("ClickToPlay_LoadAll_Bubble"));
427 DCHECK(web_contents()); 429 DCHECK(web_contents());
428 content::RenderViewHost* host = web_contents()->GetRenderViewHost(); 430 content::RenderViewHost* host = web_contents()->GetRenderViewHost();
429 // TODO(bauerb): We should send the identifiers of blocked plug-ins here. 431 // TODO(bauerb): We should send the identifiers of blocked plug-ins here.
432 ChromePluginServiceFilter::GetInstance()->AuthorizeAllPlugins(
433 host->GetProcess()->GetID());
430 host->Send(new ChromeViewMsg_LoadBlockedPlugins(host->GetRoutingID(), 434 host->Send(new ChromeViewMsg_LoadBlockedPlugins(host->GetRoutingID(),
431 std::string())); 435 std::string()));
432 set_custom_link_enabled(false); 436 set_custom_link_enabled(false);
433 TabSpecificContentSettings::FromWebContents(web_contents())-> 437 TabSpecificContentSettings::FromWebContents(web_contents())->
434 set_load_plugins_link_enabled(false); 438 set_load_plugins_link_enabled(false);
435 } 439 }
436 440
437 class ContentSettingPopupBubbleModel : public ContentSettingSingleRadioGroup { 441 class ContentSettingPopupBubbleModel : public ContentSettingSingleRadioGroup {
438 public: 442 public:
439 ContentSettingPopupBubbleModel(Delegate* delegate, 443 ContentSettingPopupBubbleModel(Delegate* delegate,
(...skipping 512 matching lines...) Expand 10 before | Expand all | Expand 10 after
952 if (type == content::NOTIFICATION_WEB_CONTENTS_DESTROYED) { 956 if (type == content::NOTIFICATION_WEB_CONTENTS_DESTROYED) {
953 DCHECK_EQ(web_contents_, 957 DCHECK_EQ(web_contents_,
954 content::Source<WebContents>(source).ptr()); 958 content::Source<WebContents>(source).ptr());
955 web_contents_ = NULL; 959 web_contents_ = NULL;
956 } else { 960 } else {
957 DCHECK_EQ(chrome::NOTIFICATION_PROFILE_DESTROYED, type); 961 DCHECK_EQ(chrome::NOTIFICATION_PROFILE_DESTROYED, type);
958 DCHECK_EQ(profile_, content::Source<Profile>(source).ptr()); 962 DCHECK_EQ(profile_, content::Source<Profile>(source).ptr());
959 profile_ = NULL; 963 profile_ = NULL;
960 } 964 }
961 } 965 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698