diff options
Diffstat (limited to 'content/browser/tab_contents')
-rw-r--r-- | content/browser/tab_contents/tab_contents.cc | 17 | ||||
-rw-r--r-- | content/browser/tab_contents/tab_contents.h | 9 | ||||
-rw-r--r-- | content/browser/tab_contents/tab_contents_observer.cc | 12 | ||||
-rw-r--r-- | content/browser/tab_contents/tab_contents_observer.h | 9 |
4 files changed, 42 insertions, 5 deletions
diff --git a/content/browser/tab_contents/tab_contents.cc b/content/browser/tab_contents/tab_contents.cc index aeb98c2..ea19f20 100644 --- a/content/browser/tab_contents/tab_contents.cc +++ b/content/browser/tab_contents/tab_contents.cc @@ -1089,9 +1089,22 @@ void TabContents::OnDocumentLoadedInFrame(int64 frame_id) { DocumentLoadedInFrame(frame_id)); } -void TabContents::OnDidFinishLoad(int64 frame_id) { +void TabContents::OnDidFinishLoad( + int64 frame_id, + const GURL& validated_url, + bool is_main_frame) { FOR_EACH_OBSERVER(TabContentsObserver, observers_, - DidFinishLoad(frame_id)); + DidFinishLoad(frame_id, validated_url, is_main_frame)); +} + +void TabContents::OnDidFailLoadWithError(int64 frame_id, + const GURL& validated_url, + bool is_main_frame, + int error_code, + const string16& error_description) { + FOR_EACH_OBSERVER(TabContentsObserver, observers_, + DidFailLoad(frame_id, validated_url, is_main_frame, + error_code, error_description)); } void TabContents::OnUpdateContentRestrictions(int restrictions) { diff --git a/content/browser/tab_contents/tab_contents.h b/content/browser/tab_contents/tab_contents.h index 55f03a5..0473b7d 100644 --- a/content/browser/tab_contents/tab_contents.h +++ b/content/browser/tab_contents/tab_contents.h @@ -623,7 +623,14 @@ class CONTENT_EXPORT TabContents : public PageNavigator, void OnDidRunInsecureContent(const std::string& security_origin, const GURL& target_url); void OnDocumentLoadedInFrame(int64 frame_id); - void OnDidFinishLoad(int64 frame_id); + void OnDidFinishLoad(int64 frame_id, + const GURL& validated_url, + bool is_main_frame); + void OnDidFailLoadWithError(int64 frame_id, + const GURL& validated_url, + bool is_main_frame, + int error_code, + const string16& error_description); void OnUpdateContentRestrictions(int restrictions); void OnGoToEntryAtOffset(int offset); void OnUpdateZoomLimits(int minimum_percent, diff --git a/content/browser/tab_contents/tab_contents_observer.cc b/content/browser/tab_contents/tab_contents_observer.cc index e79a13f..b9ad17d 100644 --- a/content/browser/tab_contents/tab_contents_observer.cc +++ b/content/browser/tab_contents/tab_contents_observer.cc @@ -69,7 +69,17 @@ void TabContentsObserver::DocumentAvailableInMainFrame() { void TabContentsObserver::DocumentLoadedInFrame(int64 frame_id) { } -void TabContentsObserver::DidFinishLoad(int64 frame_id) { +void TabContentsObserver::DidFinishLoad( + int64 frame_id, + const GURL& validated_url, + bool is_main_frame) { +} + +void TabContentsObserver::DidFailLoad(int64 frame_id, + const GURL& validated_url, + bool is_main_frame, + int error_code, + const string16& error_description) { } void TabContentsObserver::DidGetUserGesture() { diff --git a/content/browser/tab_contents/tab_contents_observer.h b/content/browser/tab_contents/tab_contents_observer.h index 03590fe..9b90758 100644 --- a/content/browser/tab_contents/tab_contents_observer.h +++ b/content/browser/tab_contents/tab_contents_observer.h @@ -58,7 +58,14 @@ class CONTENT_EXPORT TabContentsObserver : public IPC::Channel::Listener, const string16& error_description); virtual void DocumentAvailableInMainFrame(); virtual void DocumentLoadedInFrame(int64 frame_id); - virtual void DidFinishLoad(int64 frame_id); + virtual void DidFinishLoad(int64 frame_id, + const GURL& validated_url, + bool is_main_frame); + virtual void DidFailLoad(int64 frame_id, + const GURL& validated_url, + bool is_main_frame, + int error_code, + const string16& error_description); virtual void DidGetUserGesture(); virtual void DidGetIgnoredUIEvent(); virtual void DidBecomeSelected(); |