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

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

Issue 12637002: Set IsInitialNavigation to false after commit, not document load. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 9 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 | Annotate | Revision Log
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/metrics/histogram.h" 10 #include "base/metrics/histogram.h"
(...skipping 2174 matching lines...) Expand 10 before | Expand all | Expand 10 after
2185 RecordAction(UserMetricsAction("SSL.RanInsecureContent")); 2185 RecordAction(UserMetricsAction("SSL.RanInsecureContent"));
2186 if (EndsWith(security_origin, kDotGoogleDotCom, false)) 2186 if (EndsWith(security_origin, kDotGoogleDotCom, false))
2187 RecordAction(UserMetricsAction("SSL.RanInsecureContentGoogle")); 2187 RecordAction(UserMetricsAction("SSL.RanInsecureContentGoogle"));
2188 controller_.ssl_manager()->DidRunInsecureContent(security_origin); 2188 controller_.ssl_manager()->DidRunInsecureContent(security_origin);
2189 displayed_insecure_content_ = true; 2189 displayed_insecure_content_ = true;
2190 SSLManager::NotifySSLInternalStateChanged( 2190 SSLManager::NotifySSLInternalStateChanged(
2191 GetController().GetBrowserContext()); 2191 GetController().GetBrowserContext());
2192 } 2192 }
2193 2193
2194 void WebContentsImpl::OnDocumentLoadedInFrame(int64 frame_id) { 2194 void WebContentsImpl::OnDocumentLoadedInFrame(int64 frame_id) {
2195 controller_.DocumentLoadedInFrame();
2196 FOR_EACH_OBSERVER(WebContentsObserver, observers_, 2195 FOR_EACH_OBSERVER(WebContentsObserver, observers_,
2197 DocumentLoadedInFrame(frame_id, message_source_)); 2196 DocumentLoadedInFrame(frame_id, message_source_));
2198 } 2197 }
2199 2198
2200 void WebContentsImpl::OnDidFinishLoad( 2199 void WebContentsImpl::OnDidFinishLoad(
2201 int64 frame_id, 2200 int64 frame_id,
2202 const GURL& url, 2201 const GURL& url,
2203 bool is_main_frame) { 2202 bool is_main_frame) {
2204 GURL validated_url(url); 2203 GURL validated_url(url);
2205 RenderProcessHost* render_process_host = message_source_->GetProcess(); 2204 RenderProcessHost* render_process_host = message_source_->GetProcess();
(...skipping 1295 matching lines...) Expand 10 before | Expand all | Expand 10 after
3501 } 3500 }
3502 3501
3503 BrowserPluginGuestManager* 3502 BrowserPluginGuestManager*
3504 WebContentsImpl::GetBrowserPluginGuestManager() const { 3503 WebContentsImpl::GetBrowserPluginGuestManager() const {
3505 return static_cast<BrowserPluginGuestManager*>( 3504 return static_cast<BrowserPluginGuestManager*>(
3506 GetBrowserContext()->GetUserData( 3505 GetBrowserContext()->GetUserData(
3507 browser_plugin::kBrowserPluginGuestManagerKeyName)); 3506 browser_plugin::kBrowserPluginGuestManagerKeyName));
3508 } 3507 }
3509 3508
3510 } // namespace content 3509 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/web_contents/navigation_controller_impl_unittest.cc ('k') | content/public/browser/navigation_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698