mojo/services/public/cpp/view_manager/lib/view_manager_client_impl.cc - Issue 591633002: Replace most uses of ViewManagerInitService with client lib ViewManager::Embed() to offer the same …

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: mojo/services/public/cpp/view_manager/lib/view_manager_client_impl.cc

Issue 591633002: Replace most uses of ViewManagerInitService with client lib ViewManager::Embed() to offer the same … (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: . Created 6 years, 3 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 | « mojo/services/public/cpp/view_manager/BUILD.gn ('k') | mojo/services/public/cpp/view_manager/lib/view_manager_context.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: mojo/services/public/cpp/view_manager/lib/view_manager_client_impl.cc

diff --git a/mojo/services/public/cpp/view_manager/lib/view_manager_client_impl.cc b/mojo/services/public/cpp/view_manager/lib/view_manager_client_impl.cc

index bd91eade5d8190edad0aa45845b874ba658675ae..a7baa743658bbe4c78c595ac0f6e824871f35d3f 100644

--- a/mojo/services/public/cpp/view_manager/lib/view_manager_client_impl.cc

+++ b/mojo/services/public/cpp/view_manager/lib/view_manager_client_impl.cc

@@ -8,6 +8,7 @@

#include "base/command_line.h"

#include "base/message_loop/message_loop.h"

#include "base/stl_util.h"

+#include "mojo/public/cpp/application/application_impl.h"

#include "mojo/public/cpp/application/connect.h"

#include "mojo/public/cpp/application/service_provider_impl.h"

#include "mojo/public/interfaces/application/service_provider.mojom.h"

@@ -356,7 +357,8 @@ void ViewManagerClientImpl::OnViewInputEvent(

void ViewManagerClientImpl::Embed(

const String& url,

InterfaceRequest<ServiceProvider> service_provider) {

- window_manager_delegate_->Embed(url, service_provider.Pass());

+ if (window_manager_delegate_)

+ window_manager_delegate_->Embed(url, service_provider.Pass());

}

void ViewManagerClientImpl::DispatchOnViewInputEvent(EventPtr event) {