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

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

Issue 1874893002: Convert //content/browser from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 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 #include <memory>
9 10
10 #include "base/compiler_specific.h" 11 #include "base/compiler_specific.h"
11 #include "base/macros.h" 12 #include "base/macros.h"
12 #include "base/memory/scoped_ptr.h"
13 #include "build/build_config.h" 13 #include "build/build_config.h"
14 #include "content/browser/devtools/devtools_agent_host_impl.h" 14 #include "content/browser/devtools/devtools_agent_host_impl.h"
15 #include "content/common/content_export.h" 15 #include "content/common/content_export.h"
16 #include "content/public/browser/web_contents_observer.h" 16 #include "content/public/browser/web_contents_observer.h"
17 17
18 namespace cc { 18 namespace cc {
19 class CompositorFrameMetadata; 19 class CompositorFrameMetadata;
20 } 20 }
21 21
22 namespace content { 22 namespace content {
(...skipping 112 matching lines...) Expand 10 before | Expand all | Expand 10 after
135 void RenderFrameCrashed(); 135 void RenderFrameCrashed();
136 void OnSwapCompositorFrame(const IPC::Message& message); 136 void OnSwapCompositorFrame(const IPC::Message& message);
137 void OnDispatchOnInspectorFrontend( 137 void OnDispatchOnInspectorFrontend(
138 RenderFrameHost* sender, 138 RenderFrameHost* sender,
139 const DevToolsMessageChunk& message); 139 const DevToolsMessageChunk& message);
140 void OnRequestNewWindow(RenderFrameHost* sender, int new_routing_id); 140 void OnRequestNewWindow(RenderFrameHost* sender, int new_routing_id);
141 void DestroyOnRenderFrameGone(); 141 void DestroyOnRenderFrameGone();
142 142
143 class FrameHostHolder; 143 class FrameHostHolder;
144 144
145 scoped_ptr<FrameHostHolder> current_; 145 std::unique_ptr<FrameHostHolder> current_;
146 scoped_ptr<FrameHostHolder> pending_; 146 std::unique_ptr<FrameHostHolder> pending_;
147 147
148 // Stores per-host state between DisconnectWebContents and ConnectWebContents. 148 // Stores per-host state between DisconnectWebContents and ConnectWebContents.
149 scoped_ptr<FrameHostHolder> disconnected_; 149 std::unique_ptr<FrameHostHolder> disconnected_;
150 150
151 scoped_ptr<devtools::dom::DOMHandler> dom_handler_; 151 std::unique_ptr<devtools::dom::DOMHandler> dom_handler_;
152 scoped_ptr<devtools::input::InputHandler> input_handler_; 152 std::unique_ptr<devtools::input::InputHandler> input_handler_;
153 scoped_ptr<devtools::inspector::InspectorHandler> inspector_handler_; 153 std::unique_ptr<devtools::inspector::InspectorHandler> inspector_handler_;
154 scoped_ptr<devtools::io::IOHandler> io_handler_; 154 std::unique_ptr<devtools::io::IOHandler> io_handler_;
155 scoped_ptr<devtools::network::NetworkHandler> network_handler_; 155 std::unique_ptr<devtools::network::NetworkHandler> network_handler_;
156 scoped_ptr<devtools::page::PageHandler> page_handler_; 156 std::unique_ptr<devtools::page::PageHandler> page_handler_;
157 scoped_ptr<devtools::security::SecurityHandler> security_handler_; 157 std::unique_ptr<devtools::security::SecurityHandler> security_handler_;
158 scoped_ptr<devtools::service_worker::ServiceWorkerHandler> 158 std::unique_ptr<devtools::service_worker::ServiceWorkerHandler>
159 service_worker_handler_; 159 service_worker_handler_;
160 scoped_ptr<devtools::tracing::TracingHandler> tracing_handler_; 160 std::unique_ptr<devtools::tracing::TracingHandler> tracing_handler_;
161 scoped_ptr<devtools::emulation::EmulationHandler> emulation_handler_; 161 std::unique_ptr<devtools::emulation::EmulationHandler> emulation_handler_;
162 scoped_ptr<DevToolsFrameTraceRecorder> frame_trace_recorder_; 162 std::unique_ptr<DevToolsFrameTraceRecorder> frame_trace_recorder_;
163 #if defined(OS_ANDROID) 163 #if defined(OS_ANDROID)
164 scoped_ptr<PowerSaveBlockerImpl> power_save_blocker_; 164 std::unique_ptr<PowerSaveBlockerImpl> power_save_blocker_;
165 #endif 165 #endif
166 scoped_ptr<DevToolsProtocolHandler> protocol_handler_; 166 std::unique_ptr<DevToolsProtocolHandler> protocol_handler_;
167 bool current_frame_crashed_; 167 bool current_frame_crashed_;
168 168
169 // PlzNavigate 169 // PlzNavigate
170 170
171 // Handle that caused the setting of pending_. 171 // Handle that caused the setting of pending_.
172 NavigationHandle* pending_handle_; 172 NavigationHandle* pending_handle_;
173 173
174 // List of handles currently navigating. 174 // List of handles currently navigating.
175 std::set<NavigationHandle*> navigating_handles_; 175 std::set<NavigationHandle*> navigating_handles_;
176 176
177 // <call_id> -> <session_id, message> 177 // <call_id> -> <session_id, message>
178 std::map<int, std::pair<int, std::string>> 178 std::map<int, std::pair<int, std::string>>
179 in_navigation_protocol_message_buffer_; 179 in_navigation_protocol_message_buffer_;
180 180
181 // The FrameTreeNode associated with this agent. 181 // The FrameTreeNode associated with this agent.
182 FrameTreeNode* frame_tree_node_; 182 FrameTreeNode* frame_tree_node_;
183 183
184 DISALLOW_COPY_AND_ASSIGN(RenderFrameDevToolsAgentHost); 184 DISALLOW_COPY_AND_ASSIGN(RenderFrameDevToolsAgentHost);
185 }; 185 };
186 186
187 } // namespace content 187 } // namespace content
188 188
189 #endif // CONTENT_BROWSER_DEVTOOLS_RENDER_FRAME_DEVTOOLS_AGENT_HOST_H_ 189 #endif // CONTENT_BROWSER_DEVTOOLS_RENDER_FRAME_DEVTOOLS_AGENT_HOST_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698