third_party/mojo_services/src/view_manager/public/cpp/view_manager_client_factory.h - Issue 954643002: Update mojo sdk to rev 3d23dae011859a2aae49f1d1adde705c8e85d819

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: third_party/mojo_services/src/view_manager/public/cpp/view_manager_client_factory.h

Issue 954643002: Update mojo sdk to rev 3d23dae011859a2aae49f1d1adde705c8e85d819 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: use run_renderer_in_process() 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 | « third_party/mojo_services/src/view_manager/public/cpp/view.h ('k') | third_party/mojo_services/src/view_manager/public/cpp/view_manager_context.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/mojo_services/src/view_manager/public/cpp/view_manager_client_factory.h

diff --git a/third_party/mojo_services/src/view_manager/public/cpp/view_manager_client_factory.h b/third_party/mojo_services/src/view_manager/public/cpp/view_manager_client_factory.h

index edb5ca310091b363fd5ee5c54d00599332daf742..e47da3d598bd9fab89338e29e81c17599d75ab4a 100644

--- a/third_party/mojo_services/src/view_manager/public/cpp/view_manager_client_factory.h

+++ b/third_party/mojo_services/src/view_manager/public/cpp/view_manager_client_factory.h

@@ -5,7 +5,6 @@

#ifndef MOJO_SERVICES_VIEW_MANAGER_PUBLIC_CPP_VIEW_MANAGER_CLIENT_FACTORY_H_

#define MOJO_SERVICES_VIEW_MANAGER_PUBLIC_CPP_VIEW_MANAGER_CLIENT_FACTORY_H_

-#include "base/memory/scoped_ptr.h"

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

#include "view_manager/public/interfaces/view_manager.mojom.h"

@@ -22,8 +21,9 @@ class ViewManagerClientFactory : public InterfaceFactory<ViewManagerClient> {

ViewManagerClientFactory(Shell* shell, ViewManagerDelegate* delegate);

~ViewManagerClientFactory() override;

- // Creates a ViewManagerClient from the supplied arguments.

- static scoped_ptr<ViewManagerClient> WeakBindViewManagerToPipe(

+ // Creates a ViewManagerClient from the supplied arguments. Returns ownership

+ // to the caller.

+ static ViewManagerClient* WeakBindViewManagerToPipe(

InterfaceRequest<ViewManagerClient> request,

ViewManagerServicePtr view_manager_service,

Shell* shell,