| OLD | NEW |
| 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 "content/browser/web_contents/web_contents_impl.h" | 5 #include "content/browser/web_contents/web_contents_impl.h" |
| 6 | 6 |
| 7 #include <utility> | 7 #include <utility> |
| 8 | 8 |
| 9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
| 10 #include "base/lazy_instance.h" | 10 #include "base/lazy_instance.h" |
| (...skipping 2852 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2863 displayed_insecure_content_ = true; | 2863 displayed_insecure_content_ = true; |
| 2864 SSLManager::NotifySSLInternalStateChanged( | 2864 SSLManager::NotifySSLInternalStateChanged( |
| 2865 GetController().GetBrowserContext()); | 2865 GetController().GetBrowserContext()); |
| 2866 } | 2866 } |
| 2867 | 2867 |
| 2868 void WebContentsImpl::OnDidRunInsecureContent( | 2868 void WebContentsImpl::OnDidRunInsecureContent( |
| 2869 const std::string& security_origin, const GURL& target_url) { | 2869 const std::string& security_origin, const GURL& target_url) { |
| 2870 LOG(WARNING) << security_origin << " ran insecure content from " | 2870 LOG(WARNING) << security_origin << " ran insecure content from " |
| 2871 << target_url.possibly_invalid_spec(); | 2871 << target_url.possibly_invalid_spec(); |
| 2872 RecordAction(base::UserMetricsAction("SSL.RanInsecureContent")); | 2872 RecordAction(base::UserMetricsAction("SSL.RanInsecureContent")); |
| 2873 if (EndsWith(security_origin, kDotGoogleDotCom, false)) | 2873 if (base::EndsWith(security_origin, kDotGoogleDotCom, false)) |
| 2874 RecordAction(base::UserMetricsAction("SSL.RanInsecureContentGoogle")); | 2874 RecordAction(base::UserMetricsAction("SSL.RanInsecureContentGoogle")); |
| 2875 controller_.ssl_manager()->DidRunInsecureContent(security_origin); | 2875 controller_.ssl_manager()->DidRunInsecureContent(security_origin); |
| 2876 displayed_insecure_content_ = true; | 2876 displayed_insecure_content_ = true; |
| 2877 SSLManager::NotifySSLInternalStateChanged( | 2877 SSLManager::NotifySSLInternalStateChanged( |
| 2878 GetController().GetBrowserContext()); | 2878 GetController().GetBrowserContext()); |
| 2879 } | 2879 } |
| 2880 | 2880 |
| 2881 void WebContentsImpl::OnDocumentLoadedInFrame() { | 2881 void WebContentsImpl::OnDocumentLoadedInFrame() { |
| 2882 if (!HasValidFrameSource()) | 2882 if (!HasValidFrameSource()) |
| 2883 return; | 2883 return; |
| (...skipping 1576 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4460 player_map->erase(it); | 4460 player_map->erase(it); |
| 4461 } | 4461 } |
| 4462 | 4462 |
| 4463 void WebContentsImpl::SetForceDisableOverscrollContent(bool force_disable) { | 4463 void WebContentsImpl::SetForceDisableOverscrollContent(bool force_disable) { |
| 4464 force_disable_overscroll_content_ = force_disable; | 4464 force_disable_overscroll_content_ = force_disable; |
| 4465 if (view_) | 4465 if (view_) |
| 4466 view_->SetOverscrollControllerEnabled(CanOverscrollContent()); | 4466 view_->SetOverscrollControllerEnabled(CanOverscrollContent()); |
| 4467 } | 4467 } |
| 4468 | 4468 |
| 4469 } // namespace content | 4469 } // namespace content |
| OLD | NEW |