Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(57)

Side by Side Diff: content/browser/web_contents/web_contents_impl.cc

Issue 1233453011: Revert of Remove some legacy versions of StartsWith and EndsWith. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 2969 matching lines...) Expand 10 before | Expand all | Expand 10 after
2980 displayed_insecure_content_ = true; 2980 displayed_insecure_content_ = true;
2981 SSLManager::NotifySSLInternalStateChanged( 2981 SSLManager::NotifySSLInternalStateChanged(
2982 GetController().GetBrowserContext()); 2982 GetController().GetBrowserContext());
2983 } 2983 }
2984 2984
2985 void WebContentsImpl::OnDidRunInsecureContent( 2985 void WebContentsImpl::OnDidRunInsecureContent(
2986 const std::string& security_origin, const GURL& target_url) { 2986 const std::string& security_origin, const GURL& target_url) {
2987 LOG(WARNING) << security_origin << " ran insecure content from " 2987 LOG(WARNING) << security_origin << " ran insecure content from "
2988 << target_url.possibly_invalid_spec(); 2988 << target_url.possibly_invalid_spec();
2989 RecordAction(base::UserMetricsAction("SSL.RanInsecureContent")); 2989 RecordAction(base::UserMetricsAction("SSL.RanInsecureContent"));
2990 if (base::EndsWith(security_origin, kDotGoogleDotCom, 2990 if (base::EndsWith(security_origin, kDotGoogleDotCom, false))
2991 base::CompareCase::INSENSITIVE_ASCII))
2992 RecordAction(base::UserMetricsAction("SSL.RanInsecureContentGoogle")); 2991 RecordAction(base::UserMetricsAction("SSL.RanInsecureContentGoogle"));
2993 controller_.ssl_manager()->DidRunInsecureContent(security_origin); 2992 controller_.ssl_manager()->DidRunInsecureContent(security_origin);
2994 displayed_insecure_content_ = true; 2993 displayed_insecure_content_ = true;
2995 SSLManager::NotifySSLInternalStateChanged( 2994 SSLManager::NotifySSLInternalStateChanged(
2996 GetController().GetBrowserContext()); 2995 GetController().GetBrowserContext());
2997 } 2996 }
2998 2997
2999 void WebContentsImpl::OnDocumentLoadedInFrame() { 2998 void WebContentsImpl::OnDocumentLoadedInFrame() {
3000 if (!HasValidFrameSource()) 2999 if (!HasValidFrameSource())
3001 return; 3000 return;
(...skipping 1521 matching lines...) Expand 10 before | Expand all | Expand 10 after
4523 player_map->erase(it); 4522 player_map->erase(it);
4524 } 4523 }
4525 4524
4526 void WebContentsImpl::SetForceDisableOverscrollContent(bool force_disable) { 4525 void WebContentsImpl::SetForceDisableOverscrollContent(bool force_disable) {
4527 force_disable_overscroll_content_ = force_disable; 4526 force_disable_overscroll_content_ = force_disable;
4528 if (view_) 4527 if (view_)
4529 view_->SetOverscrollControllerEnabled(CanOverscrollContent()); 4528 view_->SetOverscrollControllerEnabled(CanOverscrollContent());
4530 } 4529 }
4531 4530
4532 } // namespace content 4531 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/plugin_service_impl.cc ('k') | content/browser/webui/web_ui_data_source_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698