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

Unified Diff: sky/viewer/document_view.cc

Issue 979223003: Makes DocumentView not assume it's getting services from the embedder (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: Created 5 years, 10 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/viewer/document_view.cc
diff --git a/sky/viewer/document_view.cc b/sky/viewer/document_view.cc
index 00377b2fe3911b567559ac4387a5fc6be63e16fd..e0b9637f27b432cc0797fcf7e8cdfa6923e7b945 100644
--- a/sky/viewer/document_view.cc
+++ b/sky/viewer/document_view.cc
@@ -133,9 +133,13 @@ void DocumentView::OnEmbed(
mojo::ServiceProviderPtr services_provided_by_embedder) {
root_ = root;
- mojo::ConnectToService(services_provided_by_embedder.get(), &navigator_host_);
- if (RuntimeFlags::Get().testing())
- mojo::ConnectToService(services_provided_by_embedder.get(), &test_harness_);
+ if (services_provided_by_embedder.get()) {
+ mojo::ConnectToService(services_provided_by_embedder.get(),
+ &navigator_host_);
+ if (RuntimeFlags::Get().testing())
+ mojo::ConnectToService(services_provided_by_embedder.get(),
+ &test_harness_);
+ }
services_provided_to_embedder_ = services_provided_to_embedder.Pass();
services_provided_by_embedder_ = services_provided_by_embedder.Pass();
@@ -268,9 +272,11 @@ float DocumentView::GetDevicePixelRatio() const {
blink::WebNavigationPolicy DocumentView::decidePolicyForNavigation(
const blink::WebFrameClient::NavigationPolicyInfo& info) {
- navigator_host_->RequestNavigate(
- WebNavigationPolicyToNavigationTarget(info.defaultPolicy),
- mojo::URLRequest::From(info.urlRequest).Pass());
+ if (navigator_host_.get()) {
+ navigator_host_->RequestNavigate(
+ WebNavigationPolicyToNavigationTarget(info.defaultPolicy),
+ mojo::URLRequest::From(info.urlRequest).Pass());
+ }
return blink::WebNavigationPolicyIgnore;
}
« 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