OLD | NEW |
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/public/browser/web_contents_observer.h" | 5 #include "content/public/browser/web_contents_observer.h" |
6 | 6 |
7 #include "content/browser/web_contents/web_contents_impl.h" | 7 #include "content/browser/web_contents/web_contents_impl.h" |
8 #include "content/public/browser/navigation_details.h" | 8 #include "content/public/browser/navigation_details.h" |
9 #include "content/public/browser/render_view_host.h" | 9 #include "content/public/browser/render_view_host.h" |
10 | 10 |
(...skipping 23 matching lines...) Expand all Loading... |
34 return; | 34 return; |
35 } | 35 } |
36 if (web_contents_) | 36 if (web_contents_) |
37 web_contents_->RemoveObserver(this); | 37 web_contents_->RemoveObserver(this); |
38 web_contents_ = static_cast<WebContentsImpl*>(web_contents); | 38 web_contents_ = static_cast<WebContentsImpl*>(web_contents); |
39 if (web_contents_) { | 39 if (web_contents_) { |
40 web_contents_->AddObserver(this); | 40 web_contents_->AddObserver(this); |
41 } | 41 } |
42 } | 42 } |
43 | 43 |
| 44 bool WebContentsObserver::OnMessageReceived(RenderFrameHost* render_frame_host, |
| 45 const IPC::Message& message) { |
| 46 return OnMessageReceived(message); |
| 47 } |
| 48 |
44 bool WebContentsObserver::OnMessageReceived(const IPC::Message& message) { | 49 bool WebContentsObserver::OnMessageReceived(const IPC::Message& message) { |
45 return false; | 50 return false; |
46 } | 51 } |
47 | 52 |
48 bool WebContentsObserver::Send(IPC::Message* message) { | 53 bool WebContentsObserver::Send(IPC::Message* message) { |
49 if (!web_contents_) { | 54 if (!web_contents_) { |
50 delete message; | 55 delete message; |
51 return false; | 56 return false; |
52 } | 57 } |
53 | 58 |
54 return web_contents_->Send(message); | 59 return web_contents_->Send(message); |
55 } | 60 } |
56 | 61 |
57 int WebContentsObserver::routing_id() const { | 62 int WebContentsObserver::routing_id() const { |
58 if (!web_contents_) | 63 if (!web_contents_) |
59 return MSG_ROUTING_NONE; | 64 return MSG_ROUTING_NONE; |
60 | 65 |
61 return web_contents_->GetRoutingID(); | 66 return web_contents_->GetRoutingID(); |
62 } | 67 } |
63 | 68 |
64 void WebContentsObserver::WebContentsImplDestroyed() { | 69 void WebContentsObserver::WebContentsImplDestroyed() { |
65 // Do cleanup so that 'this' can safely be deleted from WebContentsDestroyed. | 70 // Do cleanup so that 'this' can safely be deleted from WebContentsDestroyed. |
66 web_contents_->RemoveObserver(this); | 71 web_contents_->RemoveObserver(this); |
67 WebContentsImpl* contents = web_contents_; | 72 WebContentsImpl* contents = web_contents_; |
68 web_contents_ = NULL; | 73 web_contents_ = NULL; |
69 WebContentsDestroyed(contents); | 74 WebContentsDestroyed(contents); |
70 } | 75 } |
71 | 76 |
72 } // namespace content | 77 } // namespace content |
OLD | NEW |