| Index: content/shell/browser/shell.cc
|
| diff --git a/content/shell/browser/shell.cc b/content/shell/browser/shell.cc
|
| index f25b9031a76ae83d48376a88c97361fd43013c85..1c4bb35352f7aef2c03b13ae762037e1ca770a40 100644
|
| --- a/content/shell/browser/shell.cc
|
| +++ b/content/shell/browser/shell.cc
|
| @@ -37,6 +37,7 @@
|
| #include "content/shell/browser/shell_content_browser_client.h"
|
| #include "content/shell/browser/shell_devtools_frontend.h"
|
| #include "content/shell/browser/shell_javascript_dialog_manager.h"
|
| +#include "content/shell/common/layout_test/layout_test_switches.h"
|
| #include "content/shell/common/shell_messages.h"
|
| #include "content/shell/common/shell_switches.h"
|
| #include "media/media_features.h"
|
| @@ -480,6 +481,23 @@ void Shell::ActivateContents(WebContents* contents) {
|
| contents->GetRenderViewHost()->GetWidget()->Focus();
|
| }
|
|
|
| +bool Shell::ShouldAllowRunningInsecureContent(
|
| + content::WebContents* web_contents,
|
| + bool allowed_per_prefs,
|
| + const url::Origin& origin,
|
| + const GURL& resource_url) {
|
| + bool allowed_by_test = false;
|
| + if (base::CommandLine::ForCurrentProcess()->HasSwitch(
|
| + switches::kRunLayoutTest)) {
|
| + const base::DictionaryValue& test_flags =
|
| + BlinkTestController::Get()
|
| + ->accumulated_layout_test_runtime_flags_changes();
|
| + test_flags.GetBoolean("running_insecure_content_allowed", &allowed_by_test);
|
| + }
|
| +
|
| + return allowed_per_prefs || allowed_by_test;
|
| +}
|
| +
|
| gfx::Size Shell::GetShellDefaultSize() {
|
| static gfx::Size default_shell_size;
|
| if (!default_shell_size.IsEmpty())
|
|
|