From 19bb5cb57480731e0ffb67574358eca72571e52a Mon Sep 17 00:00:00 2001 From: Eric Seidel Date: Fri, 22 May 2015 13:11:39 -0700 Subject: [PATCH] Fix android build TBR=ianh@google.com Review URL: https://codereview.chromium.org/1147153005 --- shell/ui/engine.cc | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/shell/ui/engine.cc b/shell/ui/engine.cc index e3df08d99b7..cbba62afb6f 100644 --- a/shell/ui/engine.cc +++ b/shell/ui/engine.cc @@ -170,10 +170,11 @@ void Engine::OnInputEvent(InputEventPtr event) { web_view_->handleInputEvent(*web_event); } -void Engine::LoadURL(const mojo::String& url) { - if (!WebView::shouldUseWebView(responseURL)) { +void Engine::LoadURL(const mojo::String& mojo_url) { + GURL url(mojo_url); + if (!blink::WebView::shouldUseWebView(url)) { sky_view_ = blink::SkyView::Create(this); - sky_view_->Load(GURL(url)); + sky_view_->Load(url); return; } @@ -186,7 +187,7 @@ void Engine::LoadURL(const mojo::String& url) { ConfigureSettings(web_view_->settings()); web_view_->setMainFrame(blink::WebLocalFrame::create(this)); UpdateWebViewSize(); - web_view_->mainFrame()->load(GURL(url)); + web_view_->mainFrame()->load(url); } void Engine::frameDetached(blink::WebFrame* frame) {