mojo/services/public/cpp/view_manager/lib/view_manager_synchronizer.cc - Issue 298653010: Change Shell / ShellClient to ServiceProvider

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_synchronizer.cc

Issue 298653010: Change Shell / ShellClient to ServiceProvider (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Support content Mojo stuff Created 6 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

« mojo/public/interfaces/service_provider/service_provider.mojom ('K') | « mojo/services/public/cpp/view_manager/lib/view_manager_private.h ('k') | mojo/services/public/cpp/view_manager/tests/view_manager_unittest.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_synchronizer.cc

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

index 7b58f9796e1cf32011c9fd07cdc210736cd90eb1..f3b1458a9d14366b8fc9ed8cf0b3459206841ce8 100644

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

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

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

#include "base/bind.h"

#include "base/run_loop.h"

-#include "mojo/public/cpp/shell/connect.h"

-#include "mojo/public/interfaces/shell/shell.mojom.h"

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

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

#include "mojo/services/public/cpp/view_manager/lib/view_manager_private.h"

#include "mojo/services/public/cpp/view_manager/lib/view_private.h"

#include "mojo/services/public/cpp/view_manager/lib/view_tree_node_private.h"

@@ -411,8 +411,10 @@ ViewManagerSynchronizer::ViewManagerSynchronizer(ViewManager* view_manager)

next_server_change_id_(0),

sync_factory_(this),

init_loop_(NULL) {

- ConnectTo(ViewManagerPrivate(view_manager_).shell(), "mojo:mojo_view_manager",

- &service_);

+ ConnectToService(

+ ViewManagerPrivate(view_manager_).service_provider(),

+ "mojo:mojo_view_manager",

+ &service_);

service_.set_client(this);

// Start a runloop. This loop is quit when the server tells us about the