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

Unified Diff: sky/shell/ui/engine.cc

Issue 1147153005: Fix android build (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 5 years, 7 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sky/shell/ui/engine.cc
diff --git a/sky/shell/ui/engine.cc b/sky/shell/ui/engine.cc
index e3df08d99b701ea473dff315faa9341908705e36..cbba62afb6f47dac623d6de1f92650aad2f84d07 100644
--- a/sky/shell/ui/engine.cc
+++ b/sky/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) {
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698