Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(630)

Side by Side Diff: content/browser/devtools/render_view_devtools_agent_host.h

Issue 868673002: OOPIF: report both original and destination rfh in AboutToNavigateRenderFrame. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebaselined Created 5 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 #ifndef CONTENT_BROWSER_DEVTOOLS_RENDER_VIEW_DEVTOOLS_AGENT_HOST_H_ 5 #ifndef CONTENT_BROWSER_DEVTOOLS_RENDER_VIEW_DEVTOOLS_AGENT_HOST_H_
6 #define CONTENT_BROWSER_DEVTOOLS_RENDER_VIEW_DEVTOOLS_AGENT_HOST_H_ 6 #define CONTENT_BROWSER_DEVTOOLS_RENDER_VIEW_DEVTOOLS_AGENT_HOST_H_
7 7
8 #include <map> 8 #include <map>
9 9
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
45 : public IPCDevToolsAgentHost, 45 : public IPCDevToolsAgentHost,
46 private WebContentsObserver, 46 private WebContentsObserver,
47 public NotificationObserver { 47 public NotificationObserver {
48 public: 48 public:
49 static void OnCancelPendingNavigation(RenderFrameHost* pending, 49 static void OnCancelPendingNavigation(RenderFrameHost* pending,
50 RenderFrameHost* current); 50 RenderFrameHost* current);
51 51
52 void SynchronousSwapCompositorFrame( 52 void SynchronousSwapCompositorFrame(
53 const cc::CompositorFrameMetadata& frame_metadata); 53 const cc::CompositorFrameMetadata& frame_metadata);
54 54
55 bool HasRenderFrameHost(RenderFrameHost* host);
56
55 // DevTooolsAgentHost overrides. 57 // DevTooolsAgentHost overrides.
56 void DisconnectWebContents() override; 58 void DisconnectWebContents() override;
57 void ConnectWebContents(WebContents* web_contents) override; 59 void ConnectWebContents(WebContents* web_contents) override;
58 BrowserContext* GetBrowserContext() override; 60 BrowserContext* GetBrowserContext() override;
59 WebContents* GetWebContents() override; 61 WebContents* GetWebContents() override;
60 Type GetType() override; 62 Type GetType() override;
61 std::string GetTitle() override; 63 std::string GetTitle() override;
62 GURL GetURL() override; 64 GURL GetURL() override;
63 bool Activate() override; 65 bool Activate() override;
64 bool Close() override; 66 bool Close() override;
65 67
66 private: 68 private:
67 friend class DevToolsAgentHost; 69 friend class DevToolsAgentHost;
68 explicit RenderViewDevToolsAgentHost(RenderFrameHost*); 70 explicit RenderViewDevToolsAgentHost(RenderFrameHost*);
69 ~RenderViewDevToolsAgentHost() override; 71 ~RenderViewDevToolsAgentHost() override;
70 72
71 // IPCDevToolsAgentHost overrides. 73 // IPCDevToolsAgentHost overrides.
72 void DispatchProtocolMessage(const std::string& message) override; 74 void DispatchProtocolMessage(const std::string& message) override;
73 void SendMessageToAgent(IPC::Message* msg) override; 75 void SendMessageToAgent(IPC::Message* msg) override;
74 void OnClientAttached() override; 76 void OnClientAttached() override;
75 void OnClientDetached() override; 77 void OnClientDetached() override;
76 78
77 // WebContentsObserver overrides. 79 // WebContentsObserver overrides.
78 void AboutToNavigateRenderFrame(RenderFrameHost* render_frame_host) override; 80 void AboutToNavigateRenderFrame(RenderFrameHost* old_host,
81 RenderFrameHost* new_host) override;
79 void RenderFrameHostChanged(RenderFrameHost* old_host, 82 void RenderFrameHostChanged(RenderFrameHost* old_host,
80 RenderFrameHost* new_host) override; 83 RenderFrameHost* new_host) override;
81 void RenderFrameDeleted(RenderFrameHost* rvh) override; 84 void RenderFrameDeleted(RenderFrameHost* rvh) override;
82 void RenderProcessGone(base::TerminationStatus status) override; 85 void RenderProcessGone(base::TerminationStatus status) override;
83 bool OnMessageReceived(const IPC::Message& message, 86 bool OnMessageReceived(const IPC::Message& message,
84 RenderFrameHost* render_frame_host) override; 87 RenderFrameHost* render_frame_host) override;
85 bool OnMessageReceived(const IPC::Message& message) override; 88 bool OnMessageReceived(const IPC::Message& message) override;
86 void DidAttachInterstitialPage() override; 89 void DidAttachInterstitialPage() override;
87 void DidDetachInterstitialPage() override; 90 void DidDetachInterstitialPage() override;
88 void TitleWasSet(NavigationEntry* entry, bool explicit_set) override; 91 void TitleWasSet(NavigationEntry* entry, bool explicit_set) override;
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
127 #endif 130 #endif
128 NotificationRegistrar registrar_; 131 NotificationRegistrar registrar_;
129 bool reattaching_; 132 bool reattaching_;
130 133
131 DISALLOW_COPY_AND_ASSIGN(RenderViewDevToolsAgentHost); 134 DISALLOW_COPY_AND_ASSIGN(RenderViewDevToolsAgentHost);
132 }; 135 };
133 136
134 } // namespace content 137 } // namespace content
135 138
136 #endif // CONTENT_BROWSER_DEVTOOLS_RENDER_VIEW_DEVTOOLS_AGENT_HOST_H_ 139 #endif // CONTENT_BROWSER_DEVTOOLS_RENDER_VIEW_DEVTOOLS_AGENT_HOST_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698