| 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 2955 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2966 displayed_insecure_content_ = true; | 2966 displayed_insecure_content_ = true; |
| 2967 SSLManager::NotifySSLInternalStateChanged( | 2967 SSLManager::NotifySSLInternalStateChanged( |
| 2968 GetController().GetBrowserContext()); | 2968 GetController().GetBrowserContext()); |
| 2969 } | 2969 } |
| 2970 | 2970 |
| 2971 void WebContentsImpl::OnDidRunInsecureContent( | 2971 void WebContentsImpl::OnDidRunInsecureContent( |
| 2972 const std::string& security_origin, const GURL& target_url) { | 2972 const std::string& security_origin, const GURL& target_url) { |
| 2973 LOG(WARNING) << security_origin << " ran insecure content from " | 2973 LOG(WARNING) << security_origin << " ran insecure content from " |
| 2974 << target_url.possibly_invalid_spec(); | 2974 << target_url.possibly_invalid_spec(); |
| 2975 RecordAction(base::UserMetricsAction("SSL.RanInsecureContent")); | 2975 RecordAction(base::UserMetricsAction("SSL.RanInsecureContent")); |
| 2976 if (base::EndsWith(security_origin, kDotGoogleDotCom, false)) | 2976 if (base::EndsWith(security_origin, kDotGoogleDotCom, |
| 2977 base::CompareCase::INSENSITIVE_ASCII)) |
| 2977 RecordAction(base::UserMetricsAction("SSL.RanInsecureContentGoogle")); | 2978 RecordAction(base::UserMetricsAction("SSL.RanInsecureContentGoogle")); |
| 2978 controller_.ssl_manager()->DidRunInsecureContent(security_origin); | 2979 controller_.ssl_manager()->DidRunInsecureContent(security_origin); |
| 2979 displayed_insecure_content_ = true; | 2980 displayed_insecure_content_ = true; |
| 2980 SSLManager::NotifySSLInternalStateChanged( | 2981 SSLManager::NotifySSLInternalStateChanged( |
| 2981 GetController().GetBrowserContext()); | 2982 GetController().GetBrowserContext()); |
| 2982 } | 2983 } |
| 2983 | 2984 |
| 2984 void WebContentsImpl::OnDocumentLoadedInFrame() { | 2985 void WebContentsImpl::OnDocumentLoadedInFrame() { |
| 2985 if (!HasValidFrameSource()) | 2986 if (!HasValidFrameSource()) |
| 2986 return; | 2987 return; |
| (...skipping 1521 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4508 player_map->erase(it); | 4509 player_map->erase(it); |
| 4509 } | 4510 } |
| 4510 | 4511 |
| 4511 void WebContentsImpl::SetForceDisableOverscrollContent(bool force_disable) { | 4512 void WebContentsImpl::SetForceDisableOverscrollContent(bool force_disable) { |
| 4512 force_disable_overscroll_content_ = force_disable; | 4513 force_disable_overscroll_content_ = force_disable; |
| 4513 if (view_) | 4514 if (view_) |
| 4514 view_->SetOverscrollControllerEnabled(CanOverscrollContent()); | 4515 view_->SetOverscrollControllerEnabled(CanOverscrollContent()); |
| 4515 } | 4516 } |
| 4516 | 4517 |
| 4517 } // namespace content | 4518 } // namespace content |
| OLD | NEW |