Index: content/public/renderer/render_frame_observer.cc |
=================================================================== |
--- content/public/renderer/render_frame_observer.cc (revision 238191) |
+++ content/public/renderer/render_frame_observer.cc (working copy) |
@@ -1,55 +1,55 @@ |
-// Copyright (c) 2011 The Chromium Authors. All rights reserved. |
+// Copyright 2013 The Chromium Authors. All rights reserved. |
// Use of this source code is governed by a BSD-style license that can be |
// found in the LICENSE file. |
-#include "content/public/renderer/render_view_observer.h" |
+#include "content/public/renderer/render_frame_observer.h" |
-#include "content/renderer/render_view_impl.h" |
+#include "content/renderer/render_frame_impl.h" |
using blink::WebFrame; |
namespace content { |
-RenderViewObserver::RenderViewObserver(RenderView* render_view) |
- : render_view_(render_view), |
+RenderFrameObserver::RenderFrameObserver(RenderFrame* render_frame) |
+ : render_frame_(render_frame), |
routing_id_(MSG_ROUTING_NONE) { |
- // |render_view| can be NULL on unit testing. |
- if (render_view) { |
- RenderViewImpl* impl = static_cast<RenderViewImpl*>(render_view); |
+ // |render_frame| can be NULL on unit testing. |
+ if (render_frame) { |
+ RenderFrameImpl* impl = static_cast<RenderFrameImpl*>(render_frame); |
routing_id_ = impl->routing_id(); |
impl->AddObserver(this); |
} |
} |
-RenderViewObserver::~RenderViewObserver() { |
- if (render_view_) { |
- RenderViewImpl* impl = static_cast<RenderViewImpl*>(render_view_); |
+RenderFrameObserver::~RenderFrameObserver() { |
+ if (render_frame_) { |
+ RenderFrameImpl* impl = static_cast<RenderFrameImpl*>(render_frame_); |
impl->RemoveObserver(this); |
} |
} |
-void RenderViewObserver::OnDestruct() { |
+void RenderFrameObserver::OnDestruct() { |
delete this; |
} |
-bool RenderViewObserver::OnMessageReceived(const IPC::Message& message) { |
+bool RenderFrameObserver::OnMessageReceived(const IPC::Message& message) { |
return false; |
} |
-bool RenderViewObserver::Send(IPC::Message* message) { |
- if (render_view_) |
- return render_view_->Send(message); |
+bool RenderFrameObserver::Send(IPC::Message* message) { |
+ if (render_frame_) |
+ return render_frame_->Send(message); |
delete message; |
return false; |
} |
-RenderView* RenderViewObserver::render_view() const { |
- return render_view_; |
+RenderFrame* RenderFrameObserver::render_frame() const { |
+ return render_frame_; |
} |
-void RenderViewObserver::RenderViewGone() { |
- render_view_ = NULL; |
+void RenderFrameObserver::RenderFrameGone() { |
+ render_frame_ = NULL; |
} |
} // namespace content |