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

Unified Diff: content/renderer/web_ui_mojo.cc

Issue 222973003: Conversion of content_shell target to use WebLocalFrame. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Remove some TODOs Created 6 years, 9 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/renderer/web_ui_mojo.cc
diff --git a/content/renderer/web_ui_mojo.cc b/content/renderer/web_ui_mojo.cc
index 58f67a85b1f8a05bea8765b447bad967b53fd9ee..b972c9748bb186152c5932995a7e074f0a12ca11 100644
--- a/content/renderer/web_ui_mojo.cc
+++ b/content/renderer/web_ui_mojo.cc
@@ -65,7 +65,8 @@ WebUIMojo::~WebUIMojo() {
void WebUIMojo::CreateContextState() {
v8::HandleScope handle_scope(blink::mainThreadIsolate());
- blink::WebFrame* frame = render_view()->GetWebView()->mainFrame();
+ blink::WebFrame* frame =
+ render_view()->GetWebView()->mainFrame()->toWebLocalFrame();
v8::Handle<v8::Context> context = frame->mainWorldScriptContext();
gin::PerContextData* context_data = gin::PerContextData::From(context);
WebUIMojoContextStateData* data = new WebUIMojoContextStateData;
@@ -96,7 +97,8 @@ void WebUIMojo::SetHandleOnContextState(mojo::ScopedMessagePipeHandle handle) {
}
WebUIMojoContextState* WebUIMojo::GetContextState() {
- blink::WebFrame* frame = render_view()->GetWebView()->mainFrame();
+ blink::WebLocalFrame* frame =
+ render_view()->GetWebView()->mainFrame()->toWebLocalFrame();
v8::HandleScope handle_scope(blink::mainThreadIsolate());
v8::Handle<v8::Context> context = frame->mainWorldScriptContext();
gin::PerContextData* context_data = gin::PerContextData::From(context);
@@ -108,7 +110,8 @@ WebUIMojoContextState* WebUIMojo::GetContextState() {
return context_state ? context_state->state.get() : NULL;
}
-void WebUIMojo::DidClearWindowObject(blink::WebFrame* frame, int world_id) {
+void WebUIMojo::DidClearWindowObject(blink::WebLocalFrame* frame,
+ int world_id) {
if (frame != render_view()->GetWebView()->mainFrame())
return;

Powered by Google App Engine
This is Rietveld 408576698