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

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

Issue 1374053002: Remove AboutToNavigateRenderFrame, issue custom notification for DevTools. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 2 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_FRAME_DEVTOOLS_AGENT_HOST_H_ 5 #ifndef CONTENT_BROWSER_DEVTOOLS_RENDER_FRAME_DEVTOOLS_AGENT_HOST_H_
6 #define CONTENT_BROWSER_DEVTOOLS_RENDER_FRAME_DEVTOOLS_AGENT_HOST_H_ 6 #define CONTENT_BROWSER_DEVTOOLS_RENDER_FRAME_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 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
44 } 44 }
45 45
46 class CONTENT_EXPORT RenderFrameDevToolsAgentHost 46 class CONTENT_EXPORT RenderFrameDevToolsAgentHost
47 : public DevToolsAgentHostImpl, 47 : public DevToolsAgentHostImpl,
48 private WebContentsObserver { 48 private WebContentsObserver {
49 public: 49 public:
50 static void AddAllAgentHosts(DevToolsAgentHost::List* result); 50 static void AddAllAgentHosts(DevToolsAgentHost::List* result);
51 51
52 static void OnCancelPendingNavigation(RenderFrameHost* pending, 52 static void OnCancelPendingNavigation(RenderFrameHost* pending,
53 RenderFrameHost* current); 53 RenderFrameHost* current);
54 static void OnBeforeNavigation(RenderFrameHost* current,
55 RenderFrameHost* pending);
54 56
55 void SynchronousSwapCompositorFrame( 57 void SynchronousSwapCompositorFrame(
56 const cc::CompositorFrameMetadata& frame_metadata); 58 const cc::CompositorFrameMetadata& frame_metadata);
57 59
58 bool HasRenderFrameHost(RenderFrameHost* host); 60 bool HasRenderFrameHost(RenderFrameHost* host);
59 61
60 // DevTooolsAgentHost overrides. 62 // DevTooolsAgentHost overrides.
61 void DisconnectWebContents() override; 63 void DisconnectWebContents() override;
62 void ConnectWebContents(WebContents* web_contents) override; 64 void ConnectWebContents(WebContents* web_contents) override;
63 BrowserContext* GetBrowserContext() override; 65 BrowserContext* GetBrowserContext() override;
(...skipping 15 matching lines...) Expand all
79 static void AppendAgentHostForFrameIfApplicable( 81 static void AppendAgentHostForFrameIfApplicable(
80 DevToolsAgentHost::List* result, 82 DevToolsAgentHost::List* result,
81 RenderFrameHost* host); 83 RenderFrameHost* host);
82 84
83 // DevToolsAgentHostImpl overrides. 85 // DevToolsAgentHostImpl overrides.
84 void Attach() override; 86 void Attach() override;
85 void Detach() override; 87 void Detach() override;
86 void InspectElement(int x, int y) override; 88 void InspectElement(int x, int y) override;
87 89
88 // WebContentsObserver overrides. 90 // WebContentsObserver overrides.
89 void AboutToNavigateRenderFrame(RenderFrameHost* old_host,
90 RenderFrameHost* new_host) override;
91 void RenderFrameHostChanged(RenderFrameHost* old_host, 91 void RenderFrameHostChanged(RenderFrameHost* old_host,
92 RenderFrameHost* new_host) override; 92 RenderFrameHost* new_host) override;
93 void FrameDeleted(RenderFrameHost* rfh) override; 93 void FrameDeleted(RenderFrameHost* rfh) override;
94 void RenderFrameDeleted(RenderFrameHost* rfh) override; 94 void RenderFrameDeleted(RenderFrameHost* rfh) override;
95 void RenderProcessGone(base::TerminationStatus status) override; 95 void RenderProcessGone(base::TerminationStatus status) override;
96 bool OnMessageReceived(const IPC::Message& message, 96 bool OnMessageReceived(const IPC::Message& message,
97 RenderFrameHost* render_frame_host) override; 97 RenderFrameHost* render_frame_host) override;
98 bool OnMessageReceived(const IPC::Message& message) override; 98 bool OnMessageReceived(const IPC::Message& message) override;
99 void DidAttachInterstitialPage() override; 99 void DidAttachInterstitialPage() override;
100 void DidDetachInterstitialPage() override; 100 void DidDetachInterstitialPage() override;
101 void DidCommitProvisionalLoadForFrame( 101 void DidCommitProvisionalLoadForFrame(
102 RenderFrameHost* render_frame_host, 102 RenderFrameHost* render_frame_host,
103 const GURL& url, 103 const GURL& url,
104 ui::PageTransition transition_type) override; 104 ui::PageTransition transition_type) override;
105 void DidFailProvisionalLoad( 105 void DidFailProvisionalLoad(
106 RenderFrameHost* render_frame_host, 106 RenderFrameHost* render_frame_host,
107 const GURL& validated_url, 107 const GURL& validated_url,
108 int error_code, 108 int error_code,
109 const base::string16& error_description, 109 const base::string16& error_description,
110 bool was_ignored_by_handler) override; 110 bool was_ignored_by_handler) override;
111 111
112 void AboutToNavigateRenderFrame(RenderFrameHost* old_host,
113 RenderFrameHost* new_host);
114
112 void SetPending(RenderFrameHostImpl* host); 115 void SetPending(RenderFrameHostImpl* host);
113 void CommitPending(); 116 void CommitPending();
114 void DiscardPending(); 117 void DiscardPending();
115 void UpdateProtocolHandlers(RenderFrameHostImpl* host); 118 void UpdateProtocolHandlers(RenderFrameHostImpl* host);
116 119
117 bool IsChildFrame(); 120 bool IsChildFrame();
118 121
119 void OnClientAttached(); 122 void OnClientAttached();
120 void OnClientDetached(); 123 void OnClientDetached();
121 124
(...skipping 26 matching lines...) Expand all
148 #endif 151 #endif
149 scoped_ptr<DevToolsProtocolHandler> protocol_handler_; 152 scoped_ptr<DevToolsProtocolHandler> protocol_handler_;
150 bool current_frame_crashed_; 153 bool current_frame_crashed_;
151 154
152 DISALLOW_COPY_AND_ASSIGN(RenderFrameDevToolsAgentHost); 155 DISALLOW_COPY_AND_ASSIGN(RenderFrameDevToolsAgentHost);
153 }; 156 };
154 157
155 } // namespace content 158 } // namespace content
156 159
157 #endif // CONTENT_BROWSER_DEVTOOLS_RENDER_FRAME_DEVTOOLS_AGENT_HOST_H_ 160 #endif // CONTENT_BROWSER_DEVTOOLS_RENDER_FRAME_DEVTOOLS_AGENT_HOST_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698