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 "chrome/browser/extensions/api/messaging/extension_message_port.h" | 5 #include "chrome/browser/extensions/api/messaging/extension_message_port.h" |
6 | 6 |
7 #include "base/memory/ptr_util.h" | 7 #include "base/memory/ptr_util.h" |
8 #include "base/scoped_observer.h" | 8 #include "base/scoped_observer.h" |
9 #include "chrome/browser/profiles/profile.h" | 9 #include "chrome/browser/profiles/profile.h" |
10 #include "content/public/browser/interstitial_page.h" | 10 #include "content/public/browser/interstitial_page.h" |
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
53 | 53 |
54 private: | 54 private: |
55 // content::WebContentsObserver overrides: | 55 // content::WebContentsObserver overrides: |
56 void RenderFrameDeleted(content::RenderFrameHost* render_frame_host) | 56 void RenderFrameDeleted(content::RenderFrameHost* render_frame_host) |
57 override { | 57 override { |
58 port_->UnregisterFrame(render_frame_host); | 58 port_->UnregisterFrame(render_frame_host); |
59 } | 59 } |
60 | 60 |
61 void DidFinishNavigation( | 61 void DidFinishNavigation( |
62 content::NavigationHandle* navigation_handle) override { | 62 content::NavigationHandle* navigation_handle) override { |
63 if (navigation_handle->HasCommitted() && !navigation_handle->IsSamePage()) | 63 if (navigation_handle->HasCommitted() && |
| 64 !navigation_handle->IsSameDocument()) { |
64 port_->UnregisterFrame(navigation_handle->GetRenderFrameHost()); | 65 port_->UnregisterFrame(navigation_handle->GetRenderFrameHost()); |
| 66 } |
65 } | 67 } |
66 | 68 |
67 void DidDetachInterstitialPage() override { | 69 void DidDetachInterstitialPage() override { |
68 if (interstitial_frame_) | 70 if (interstitial_frame_) |
69 port_->UnregisterFrame(interstitial_frame_); | 71 port_->UnregisterFrame(interstitial_frame_); |
70 } | 72 } |
71 | 73 |
72 // extensions::ProcessManagerObserver overrides: | 74 // extensions::ProcessManagerObserver overrides: |
73 void OnExtensionFrameUnregistered( | 75 void OnExtensionFrameUnregistered( |
74 const std::string& extension_id, | 76 const std::string& extension_id, |
(...skipping 224 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
299 return; | 301 return; |
300 } | 302 } |
301 for (content::RenderFrameHost* rfh : frames_) { | 303 for (content::RenderFrameHost* rfh : frames_) { |
302 IPC::Message* msg_copy = new IPC::Message(*msg); | 304 IPC::Message* msg_copy = new IPC::Message(*msg); |
303 msg_copy->set_routing_id(rfh->GetRoutingID()); | 305 msg_copy->set_routing_id(rfh->GetRoutingID()); |
304 rfh->Send(msg_copy); | 306 rfh->Send(msg_copy); |
305 } | 307 } |
306 } | 308 } |
307 | 309 |
308 } // namespace extensions | 310 } // namespace extensions |
OLD | NEW |