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

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

Issue 182713005: Remove frame ID from DidCommitProvisionalLoad. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix John's comments and signin test Created 6 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/debug/trace_event.h" 10 #include "base/debug/trace_event.h"
(...skipping 2085 matching lines...) Expand 10 before | Expand all | Expand 10 after
2096 const GURL& validated_target_url) { 2096 const GURL& validated_target_url) {
2097 // Notify observers about the provisional change in the main frame URL. 2097 // Notify observers about the provisional change in the main frame URL.
2098 FOR_EACH_OBSERVER( 2098 FOR_EACH_OBSERVER(
2099 WebContentsObserver, 2099 WebContentsObserver,
2100 observers_, 2100 observers_,
2101 ProvisionalChangeToMainFrameUrl(validated_target_url, 2101 ProvisionalChangeToMainFrameUrl(validated_target_url,
2102 render_frame_host)); 2102 render_frame_host));
2103 } 2103 }
2104 2104
2105 void WebContentsImpl::DidCommitProvisionalLoad( 2105 void WebContentsImpl::DidCommitProvisionalLoad(
2106 int64 frame_id, 2106 RenderFrameHostImpl* render_frame_host,
2107 const base::string16& frame_unique_name, 2107 const base::string16& frame_unique_name,
2108 bool is_main_frame, 2108 bool is_main_frame,
2109 const GURL& url, 2109 const GURL& url,
2110 PageTransition transition_type, 2110 PageTransition transition_type) {
2111 RenderFrameHostImpl* render_frame_host) {
2112 RenderViewHost* render_view_host = render_frame_host->render_view_host(); 2111 RenderViewHost* render_view_host = render_frame_host->render_view_host();
2112 int render_frame_id = render_frame_host->GetRoutingID();
Charlie Reis 2014/03/03 07:14:50 Nasko: I changed this to store the render_frame_id
nasko 2014/03/03 15:01:22 The test will likely be removed as the old style s
2113 // Notify observers about the commit of the provisional load. 2113 // Notify observers about the commit of the provisional load.
2114 FOR_EACH_OBSERVER( 2114 FOR_EACH_OBSERVER(
2115 WebContentsObserver, 2115 WebContentsObserver,
2116 observers_, 2116 observers_,
2117 DidCommitProvisionalLoadForFrame(frame_id, 2117 DidCommitProvisionalLoadForFrame(render_frame_id,
2118 frame_unique_name, 2118 frame_unique_name,
2119 is_main_frame, 2119 is_main_frame,
2120 url, 2120 url,
2121 transition_type, 2121 transition_type,
2122 render_view_host)); 2122 render_view_host));
2123 } 2123 }
2124 2124
2125 void WebContentsImpl::DidNavigateMainFramePostCommit( 2125 void WebContentsImpl::DidNavigateMainFramePostCommit(
2126 const LoadCommittedDetails& details, 2126 const LoadCommittedDetails& details,
2127 const FrameHostMsg_DidCommitProvisionalLoad_Params& params) { 2127 const FrameHostMsg_DidCommitProvisionalLoad_Params& params) {
(...skipping 1516 matching lines...) Expand 10 before | Expand all | Expand 10 after
3644 3644
3645 void WebContentsImpl::OnPreferredSizeChanged(const gfx::Size& old_size) { 3645 void WebContentsImpl::OnPreferredSizeChanged(const gfx::Size& old_size) {
3646 if (!delegate_) 3646 if (!delegate_)
3647 return; 3647 return;
3648 const gfx::Size new_size = GetPreferredSize(); 3648 const gfx::Size new_size = GetPreferredSize();
3649 if (new_size != old_size) 3649 if (new_size != old_size)
3650 delegate_->UpdatePreferredSize(this, new_size); 3650 delegate_->UpdatePreferredSize(this, new_size);
3651 } 3651 }
3652 3652
3653 } // namespace content 3653 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698