diff options
| author | tsepez@chromium.org <tsepez@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-23 22:50:46 +0000 |
|---|---|---|
| committer | tsepez@chromium.org <tsepez@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-23 22:50:46 +0000 |
| commit | da43a7d169529476baf0935c55bbc68acab16c5f (patch) | |
| tree | 3183f03e6e9531cbfe4e77a23aa9a826394f0198 | |
| parent | 4cb3921ebeede145702a9b7eea29a308bba73822 (diff) | |
| download | chromium_src-da43a7d169529476baf0935c55bbc68acab16c5f.zip chromium_src-da43a7d169529476baf0935c55bbc68acab16c5f.tar.gz chromium_src-da43a7d169529476baf0935c55bbc68acab16c5f.tar.bz2 | |
Pop fewer insecure content bars.
BUG=87860
Review URL: https://chromiumcodereview.appspot.com/10332319
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@138632 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/renderer/chrome_render_view_observer.cc | 6 | ||||
| -rw-r--r-- | chrome/renderer/chrome_render_view_observer.h | 1 |
2 files changed, 6 insertions, 1 deletions
diff --git a/chrome/renderer/chrome_render_view_observer.cc b/chrome/renderer/chrome_render_view_observer.cc index f1d2008..370552c 100644 --- a/chrome/renderer/chrome_render_view_observer.cc +++ b/chrome/renderer/chrome_render_view_observer.cc @@ -229,6 +229,7 @@ ChromeRenderViewObserver::ChromeRenderViewObserver( last_indexed_page_id_(-1), allow_displaying_insecure_content_(false), allow_running_insecure_content_(false), + warned_about_insecure_content_(false), capture_timer_(false, false) { const CommandLine& command_line = *CommandLine::ForCurrentProcess(); render_view->GetWebView()->setPermissionClient(this); @@ -613,7 +614,10 @@ bool ChromeRenderViewObserver::allowRunningInsecureContent( isHostInDomain(origin_host, kFacebookDotCom) || isHostInDomain(origin_host, kTwitterDotCom) || IsStrictSecurityHost(origin_host))) { - Send(new ChromeViewHostMsg_DidBlockRunningInsecureContent(routing_id())); + if (!warned_about_insecure_content_) { + warned_about_insecure_content_ = true; + Send(new ChromeViewHostMsg_DidBlockRunningInsecureContent(routing_id())); + } return false; } diff --git a/chrome/renderer/chrome_render_view_observer.h b/chrome/renderer/chrome_render_view_observer.h index 1f28a9d..923e006 100644 --- a/chrome/renderer/chrome_render_view_observer.h +++ b/chrome/renderer/chrome_render_view_observer.h @@ -205,6 +205,7 @@ class ChromeRenderViewObserver : public content::RenderViewObserver, // Insecure content may be permitted for the duration of this render view. bool allow_displaying_insecure_content_; bool allow_running_insecure_content_; + bool warned_about_insecure_content_; std::set<std::string> strict_security_hosts_; // External host exposed through automation controller. |