diff options
Diffstat (limited to 'chrome/renderer/render_view.cc')
| -rw-r--r-- | chrome/renderer/render_view.cc | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/chrome/renderer/render_view.cc b/chrome/renderer/render_view.cc index cc46bda..dab8043 100644 --- a/chrome/renderer/render_view.cc +++ b/chrome/renderer/render_view.cc @@ -27,8 +27,8 @@ #include "chrome/common/url_constants.h" #include "chrome/renderer/about_handler.h" #include "chrome/renderer/debug_message_handler.h" -#include "chrome/renderer/dev_tools_agent.h" -#include "chrome/renderer/dev_tools_client.h" +#include "chrome/renderer/devtools_agent.h" +#include "chrome/renderer/devtools_client.h" #include "chrome/renderer/localized_error.h" #include "chrome/renderer/media/audio_renderer_impl.h" #include "chrome/renderer/render_process.h" @@ -179,8 +179,8 @@ RenderView::RenderView(RenderThreadBase* render_thread) method_factory_(this), first_default_plugin_(NULL), printed_document_width_(0), - dev_tools_agent_(NULL), - dev_tools_client_(NULL), + devtools_agent_(NULL), + devtools_client_(NULL), history_back_list_count_(0), history_forward_list_count_(0), disable_popup_blocking_(false), @@ -207,8 +207,8 @@ RenderView::~RenderView() { render_thread_->RemoveFilter(debug_message_handler_); - dev_tools_agent_->RenderViewDestroyed(); - render_thread_->RemoveFilter(dev_tools_agent_); + devtools_agent_->RenderViewDestroyed(); + render_thread_->RemoveFilter(devtools_agent_); #ifdef CHROME_PERSONALIZATION Personalization::CleanupRendererPersonalization(personalization_); @@ -295,7 +295,7 @@ void RenderView::Init(gfx::NativeViewId parent_hwnd, decrement_shared_popup_at_destruction_ = false; } - dev_tools_agent_ = new DevToolsAgent(routing_id, this, + devtools_agent_ = new DevToolsAgent(routing_id, this, MessageLoop::current()); webwidget_ = WebView::Create(this, webkit_prefs); @@ -329,7 +329,7 @@ void RenderView::Init(gfx::NativeViewId parent_hwnd, debug_message_handler_ = new DebugMessageHandler(this); render_thread_->AddFilter(debug_message_handler_); - render_thread_->AddFilter(dev_tools_agent_); + render_thread_->AddFilter(devtools_agent_); } void RenderView::OnMessageReceived(const IPC::Message& message) { @@ -340,7 +340,7 @@ void RenderView::OnMessageReceived(const IPC::Message& message) { #endif // If this is developer tools renderer intercept tools messages first. - if (dev_tools_client_.get() && dev_tools_client_->OnMessageReceived(message)) + if (devtools_client_.get() && devtools_client_->OnMessageReceived(message)) return; IPC_BEGIN_MESSAGE_MAP(RenderView, message) @@ -904,8 +904,8 @@ void RenderView::OnShowJavaScriptConsole() { } void RenderView::OnSetupDevToolsClient() { - DCHECK(!dev_tools_client_.get()); - dev_tools_client_.reset(new DevToolsClient(this)); + DCHECK(!devtools_client_.get()); + devtools_client_.reset(new DevToolsClient(this)); } void RenderView::OnStopFinding(bool clear_selection) { @@ -2472,7 +2472,7 @@ void RenderView::DownloadUrl(const GURL& url, const GURL& referrer) { } WebDevToolsAgentDelegate* RenderView::GetWebDevToolsAgentDelegate() { - return dev_tools_agent_; + return devtools_agent_; } WebFrame* RenderView::GetChildFrame(const std::wstring& frame_xpath) const { |