services/ui/view_manager/view_manager_app.cc - Issue 1919313002: ApplicationImpl::ConnectToServiceDeprecated() -> mojo::ConnectToService() conversion, part 3.

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: services/ui/view_manager/view_manager_app.cc

Issue 1919313002: ApplicationImpl::ConnectToServiceDeprecated() -> mojo::ConnectToService() conversion, part 3. (Closed) Base URL: https://github.com/domokit/mojo.git@master

Patch Set: Created 4 years, 8 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 | « services/ui/view_manager/view_associate_table.cc ('k') | services/url_response_disk_cache/url_response_disk_cache_apptest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: services/ui/view_manager/view_manager_app.cc

diff --git a/services/ui/view_manager/view_manager_app.cc b/services/ui/view_manager/view_manager_app.cc

index 07d2d897b8d402026d60b18aaad22f2e9a66a2f6..a77b49a347b7eb8e7c1bf03c5f640b3f5efcdbe8 100644

--- a/services/ui/view_manager/view_manager_app.cc

+++ b/services/ui/view_manager/view_manager_app.cc

@@ -15,6 +15,7 @@

#include "mojo/public/c/system/main.h"

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

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

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

#include "services/ui/view_manager/view_manager_impl.h"

namespace view_manager {

@@ -36,7 +37,8 @@ void ViewManagerApp::Initialize(mojo::ApplicationImpl* app_impl) {

// Connect to compositor.

mojo::gfx::composition::CompositorPtr compositor;

- app_impl_->ConnectToServiceDeprecated("mojo:compositor_service", &compositor);

+ mojo::ConnectToService(app_impl_->shell(), "mojo:compositor_service",

+ GetProxy(&compositor));

compositor.set_connection_error_handler(base::Bind(

&ViewManagerApp::OnCompositorConnectionError, base::Unretained(this)));