OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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/tab_contents/tab_contents_observer.h" | 5 #include "content/browser/tab_contents/tab_contents_observer.h" |
6 | 6 |
7 #include "content/browser/renderer_host/render_view_host.h" | 7 #include "content/browser/renderer_host/render_view_host.h" |
8 #include "content/browser/tab_contents/navigation_details.h" | 8 #include "content/browser/tab_contents/navigation_details.h" |
9 #include "content/browser/tab_contents/tab_contents.h" | 9 #include "content/browser/tab_contents/tab_contents.h" |
10 | 10 |
(...skipping 28 matching lines...) Expand all Loading... |
39 const GURL& opener_url) { | 39 const GURL& opener_url) { |
40 } | 40 } |
41 | 41 |
42 void TabContentsObserver::DidCommitProvisionalLoadForFrame( | 42 void TabContentsObserver::DidCommitProvisionalLoadForFrame( |
43 int64 frame_id, | 43 int64 frame_id, |
44 bool is_main_frame, | 44 bool is_main_frame, |
45 const GURL& url, | 45 const GURL& url, |
46 PageTransition::Type transition_type) { | 46 PageTransition::Type transition_type) { |
47 } | 47 } |
48 | 48 |
49 void TabContentsObserver::DidFailProvisionalLoad(int64 frame_id, | 49 void TabContentsObserver::DidFailProvisionalLoad( |
50 bool is_main_frame, | 50 int64 frame_id, |
51 const GURL& validated_url, | 51 bool is_main_frame, |
52 int error_code) { | 52 const GURL& validated_url, |
| 53 int error_code, |
| 54 const string16& error_description) { |
53 } | 55 } |
54 | 56 |
55 void TabContentsObserver::DocumentLoadedInFrame(int64 frame_id) { | 57 void TabContentsObserver::DocumentLoadedInFrame(int64 frame_id) { |
56 } | 58 } |
57 | 59 |
58 void TabContentsObserver::DidFinishLoad(int64 frame_id) { | 60 void TabContentsObserver::DidFinishLoad(int64 frame_id) { |
59 } | 61 } |
60 | 62 |
61 void TabContentsObserver::DidGetUserGesture() { | 63 void TabContentsObserver::DidGetUserGesture() { |
62 } | 64 } |
(...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
145 } | 147 } |
146 | 148 |
147 void TabContentsObserver::TabContentsDestroyed() { | 149 void TabContentsObserver::TabContentsDestroyed() { |
148 // Do cleanup so that 'this' can safely be deleted from | 150 // Do cleanup so that 'this' can safely be deleted from |
149 // TabContentsDestroyed. | 151 // TabContentsDestroyed. |
150 tab_contents_->RemoveObserver(this); | 152 tab_contents_->RemoveObserver(this); |
151 TabContents* tab = tab_contents_; | 153 TabContents* tab = tab_contents_; |
152 tab_contents_ = NULL; | 154 tab_contents_ = NULL; |
153 TabContentsDestroyed(tab); | 155 TabContentsDestroyed(tab); |
154 } | 156 } |
OLD | NEW |