| Index: chrome/browser/ui/content_settings/content_setting_bubble_model.cc
|
| diff --git a/chrome/browser/ui/content_settings/content_setting_bubble_model.cc b/chrome/browser/ui/content_settings/content_setting_bubble_model.cc
|
| index 4d611575aec8e05273e034689a2c637d71d2ff10..da70129b8f05e70f396a2dd6eba3fc3fbb107845 100644
|
| --- a/chrome/browser/ui/content_settings/content_setting_bubble_model.cc
|
| +++ b/chrome/browser/ui/content_settings/content_setting_bubble_model.cc
|
| @@ -16,6 +16,8 @@
|
| #include "chrome/browser/content_settings/chrome_content_settings_utils.h"
|
| #include "chrome/browser/content_settings/cookie_settings_factory.h"
|
| #include "chrome/browser/content_settings/host_content_settings_map_factory.h"
|
| +#include "chrome/browser/content_settings/mixed_content_settings.h"
|
| +#include "chrome/browser/content_settings/tab_specific_content_settings.h"
|
| #include "chrome/browser/custom_handlers/protocol_handler_registry.h"
|
| #include "chrome/browser/custom_handlers/protocol_handler_registry_factory.h"
|
| #include "chrome/browser/infobars/infobar_service.h"
|
| @@ -1049,6 +1051,14 @@ void ContentSettingMixedScriptBubbleModel::OnCustomLinkClicked() {
|
| if (!web_contents())
|
| return;
|
|
|
| + MixedContentSettings* mixed_content_settings =
|
| + MixedContentSettings::FromWebContents(web_contents());
|
| + if (mixed_content_settings) {
|
| + // Update browser side settings to allow active mixed content.
|
| + mixed_content_settings->AllowRunningOfInsecureContent();
|
| + }
|
| +
|
| + // Update renderer side settings to allow active mixed content.
|
| web_contents()->SendToAllFrames(
|
| new ChromeViewMsg_SetAllowRunningInsecureContent(MSG_ROUTING_NONE, true));
|
| web_contents()->GetMainFrame()->Send(new ChromeViewMsg_ReloadFrame(
|
|
|