Commit 1edcc014 authored by pfeldman's avatar pfeldman Committed by Commit bot

DevTools: rename RenderViewDevToolsAgentHost to RenderFrame*.

R=dgozman
TBR=nasko

BUG=451004

Review URL: https://codereview.chromium.org/884873004

Cr-Commit-Position: refs/heads/master@{#313745}
parent ea2c721a
...@@ -6,7 +6,6 @@ ...@@ -6,7 +6,6 @@
#include "base/memory/scoped_ptr.h" #include "base/memory/scoped_ptr.h"
#include "base/time/time.h" #include "base/time/time.h"
#include "content/browser/devtools/devtools_manager.h" #include "content/browser/devtools/devtools_manager.h"
#include "content/browser/devtools/render_view_devtools_agent_host.h"
#include "content/browser/devtools/shared_worker_devtools_manager.h" #include "content/browser/devtools/shared_worker_devtools_manager.h"
#include "content/browser/shared_worker/shared_worker_instance.h" #include "content/browser/shared_worker/shared_worker_instance.h"
#include "content/browser/shared_worker/worker_storage_partition.h" #include "content/browser/shared_worker/worker_storage_partition.h"
......
...@@ -2,8 +2,8 @@ ...@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
#ifndef CONTENT_BROWSER_DEVTOOLS_RENDER_VIEW_DEVTOOLS_AGENT_HOST_H_ #ifndef CONTENT_BROWSER_DEVTOOLS_RENDER_FRAME_DEVTOOLS_AGENT_HOST_H_
#define CONTENT_BROWSER_DEVTOOLS_RENDER_VIEW_DEVTOOLS_AGENT_HOST_H_ #define CONTENT_BROWSER_DEVTOOLS_RENDER_FRAME_DEVTOOLS_AGENT_HOST_H_
#include <map> #include <map>
...@@ -41,7 +41,7 @@ namespace power { class PowerHandler; } ...@@ -41,7 +41,7 @@ namespace power { class PowerHandler; }
namespace tracing { class TracingHandler; } namespace tracing { class TracingHandler; }
} }
class CONTENT_EXPORT RenderViewDevToolsAgentHost class CONTENT_EXPORT RenderFrameDevToolsAgentHost
: public IPCDevToolsAgentHost, : public IPCDevToolsAgentHost,
private WebContentsObserver, private WebContentsObserver,
public NotificationObserver { public NotificationObserver {
...@@ -67,8 +67,8 @@ class CONTENT_EXPORT RenderViewDevToolsAgentHost ...@@ -67,8 +67,8 @@ class CONTENT_EXPORT RenderViewDevToolsAgentHost
private: private:
friend class DevToolsAgentHost; friend class DevToolsAgentHost;
explicit RenderViewDevToolsAgentHost(RenderFrameHost*); explicit RenderFrameDevToolsAgentHost(RenderFrameHost*);
~RenderViewDevToolsAgentHost() override; ~RenderFrameDevToolsAgentHost() override;
// IPCDevToolsAgentHost overrides. // IPCDevToolsAgentHost overrides.
void DispatchProtocolMessage(const std::string& message) override; void DispatchProtocolMessage(const std::string& message) override;
...@@ -131,9 +131,9 @@ class CONTENT_EXPORT RenderViewDevToolsAgentHost ...@@ -131,9 +131,9 @@ class CONTENT_EXPORT RenderViewDevToolsAgentHost
NotificationRegistrar registrar_; NotificationRegistrar registrar_;
bool reattaching_; bool reattaching_;
DISALLOW_COPY_AND_ASSIGN(RenderViewDevToolsAgentHost); DISALLOW_COPY_AND_ASSIGN(RenderFrameDevToolsAgentHost);
}; };
} // namespace content } // namespace content
#endif // CONTENT_BROWSER_DEVTOOLS_RENDER_VIEW_DEVTOOLS_AGENT_HOST_H_ #endif // CONTENT_BROWSER_DEVTOOLS_RENDER_FRAME_DEVTOOLS_AGENT_HOST_H_
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
#include "base/stl_util.h" #include "base/stl_util.h"
#include "base/trace_event/trace_event.h" #include "base/trace_event/trace_event.h"
#include "content/browser/child_process_security_policy_impl.h" #include "content/browser/child_process_security_policy_impl.h"
#include "content/browser/devtools/render_view_devtools_agent_host.h" #include "content/browser/devtools/render_frame_devtools_agent_host.h"
#include "content/browser/frame_host/cross_site_transferring_request.h" #include "content/browser/frame_host/cross_site_transferring_request.h"
#include "content/browser/frame_host/debug_urls.h" #include "content/browser/frame_host/debug_urls.h"
#include "content/browser/frame_host/interstitial_page_impl.h" #include "content/browser/frame_host/interstitial_page_impl.h"
...@@ -1797,7 +1797,7 @@ RenderFrameHostManager::UnsetPendingRenderFrameHost() { ...@@ -1797,7 +1797,7 @@ RenderFrameHostManager::UnsetPendingRenderFrameHost() {
scoped_ptr<RenderFrameHostImpl> pending_render_frame_host = scoped_ptr<RenderFrameHostImpl> pending_render_frame_host =
pending_render_frame_host_.Pass(); pending_render_frame_host_.Pass();
RenderViewDevToolsAgentHost::OnCancelPendingNavigation( RenderFrameDevToolsAgentHost::OnCancelPendingNavigation(
pending_render_frame_host.get(), pending_render_frame_host.get(),
render_frame_host_.get()); render_frame_host_.get());
......
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
#include "content/browser/android/edge_effect_l.h" #include "content/browser/android/edge_effect_l.h"
#include "content/browser/android/in_process/synchronous_compositor_impl.h" #include "content/browser/android/in_process/synchronous_compositor_impl.h"
#include "content/browser/android/overscroll_controller_android.h" #include "content/browser/android/overscroll_controller_android.h"
#include "content/browser/devtools/render_view_devtools_agent_host.h" #include "content/browser/devtools/render_frame_devtools_agent_host.h"
#include "content/browser/gpu/browser_gpu_channel_host_factory.h" #include "content/browser/gpu/browser_gpu_channel_host_factory.h"
#include "content/browser/gpu/compositor_util.h" #include "content/browser/gpu/compositor_util.h"
#include "content/browser/gpu/gpu_data_manager_impl.h" #include "content/browser/gpu/gpu_data_manager_impl.h"
...@@ -1201,9 +1201,10 @@ void RenderWidgetHostViewAndroid::SynchronousFrameMetadata( ...@@ -1201,9 +1201,10 @@ void RenderWidgetHostViewAndroid::SynchronousFrameMetadata(
// Unblock the compositor. // Unblock the compositor.
BrowserThread::PostTask( BrowserThread::PostTask(
BrowserThread::UI, FROM_HERE, BrowserThread::UI, FROM_HERE,
base::Bind(&RenderViewDevToolsAgentHost::SynchronousSwapCompositorFrame, base::Bind(
static_cast<RenderViewDevToolsAgentHost*>(dtah.get()), &RenderFrameDevToolsAgentHost::SynchronousSwapCompositorFrame,
frame_metadata)); static_cast<RenderFrameDevToolsAgentHost*>(dtah.get()),
frame_metadata));
} }
} }
......
...@@ -490,8 +490,8 @@ ...@@ -490,8 +490,8 @@
'browser/devtools/protocol/usage_and_quota_query.h', 'browser/devtools/protocol/usage_and_quota_query.h',
'browser/devtools/protocol/worker_handler.cc', 'browser/devtools/protocol/worker_handler.cc',
'browser/devtools/protocol/worker_handler.h', 'browser/devtools/protocol/worker_handler.h',
'browser/devtools/render_view_devtools_agent_host.cc', 'browser/devtools/render_frame_devtools_agent_host.cc',
'browser/devtools/render_view_devtools_agent_host.h', 'browser/devtools/render_frame_devtools_agent_host.h',
'browser/devtools/service_worker_devtools_agent_host.cc', 'browser/devtools/service_worker_devtools_agent_host.cc',
'browser/devtools/service_worker_devtools_agent_host.h', 'browser/devtools/service_worker_devtools_agent_host.h',
'browser/devtools/service_worker_devtools_manager.cc', 'browser/devtools/service_worker_devtools_manager.cc',
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment