bcarrella/cef
1
0
Fork 0
mirror of https://bitbucket.org/chromiumembedded/cef synced 2025-06-05 21:39:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Update to Chromium revision 137849.

Browse Source 
git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@631 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
Marshall Greenblatt
2012-05-18 20:32:28 +00:00
parent 761187a673
commit 9c9711c2d8
12 changed files with 88 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libcef/browser/browser_host_impl.cc
View File

@ -902,7 +902,8 @@ void CefBrowserHostImpl::DidCommitProvisionalLoadForFrame(
int64 frame_id,
bool is_main_frame,
const GURL& url,
content::PageTransition transition_type) {
content::PageTransition transition_type,
content::RenderViewHost* render_view_host) {
CefRefPtr<CefFrame> frame = GetOrCreateFrame(frame_id,
CefFrameHostImpl::kUnspecifiedFrameId, is_main_frame, string16(), url);
OnLoadStart(frame, url, transition_type);
@ -915,7 +916,8 @@ void CefBrowserHostImpl::DidFailProvisionalLoad(
bool is_main_frame,
const GURL& validated_url,
int error_code,
const string16& error_description) {
const string16& error_description,
content::RenderViewHost* render_view_host) {
CefRefPtr<CefFrame> frame = GetOrCreateFrame(frame_id,
CefFrameHostImpl::kUnspecifiedFrameId, is_main_frame, string16(),
validated_url);