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

Unified Diff: content/shell/renderer/shell_render_frame_observer.cc

Issue 138333006: Now that RenderFrame is 1:1 with WebFrame, add the associated getters and start cleaning up assumpt… (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 6 years, 11 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 side-by-side diff with in-line comments
Download patch
Index: content/shell/renderer/shell_render_frame_observer.cc
===================================================================
--- content/shell/renderer/shell_render_frame_observer.cc (revision 244810)
+++ content/shell/renderer/shell_render_frame_observer.cc (working copy)
@@ -5,6 +5,7 @@
#include "content/shell/renderer/shell_render_frame_observer.h"
#include "base/command_line.h"
+#include "content/public/renderer/render_frame.h"
#include "content/shell/common/shell_switches.h"
#include "content/shell/renderer/shell_render_process_observer.h"
#include "content/shell/renderer/test_runner/WebTestInterfaces.h"
@@ -15,14 +16,11 @@
ShellRenderFrameObserver::ShellRenderFrameObserver(RenderFrame* render_frame)
: RenderFrameObserver(render_frame) {
-}
-
-void ShellRenderFrameObserver::WebFrameCreated(blink::WebFrame* frame) {
if (!CommandLine::ForCurrentProcess()->HasSwitch(switches::kDumpRenderTree))
return;
- frame->setPermissionClient(
- ShellRenderProcessObserver::GetInstance()->test_interfaces()->testRunner()
- ->webPermissions());
+ render_frame->GetWebFrame()->setPermissionClient(
+ ShellRenderProcessObserver::GetInstance()->test_interfaces()->
+ testRunner()->webPermissions());
}
} // namespace content

Powered by Google App Engine
This is Rietveld 408576698