trunk/src/mojo/public/cpp/shell/connect.h - Issue 304593002: Revert 272983 "Change Shell / ShellClient to ServiceProvider"

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

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

Side by Side Diff: trunk/src/mojo/public/cpp/shell/connect.h

Issue 304593002: Revert 272983 "Change Shell / ShellClient to ServiceProvider" (Closed) Base URL: svn://svn.chromium.org/chrome/

Patch Set: 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:

OLD	NEW
1 // Copyright 2014 The Chromium Authors. All rights reserved.	1 // Copyright 2014 The Chromium Authors. All rights reserved.

2 // Use of this source code is governed by a BSD-style license that can be	2 // Use of this source code is governed by a BSD-style license that can be

3 // found in the LICENSE file.	3 // found in the LICENSE file.

4	4

5 #ifndef MOJO_PUBLIC_CPP_SHELL_CONNECT_H_	5 #ifndef MOJO_PUBLIC_CPP_SHELL_CONNECT_H_

6 #define MOJO_PUBLIC_CPP_SHELL_CONNECT_H_	6 #define MOJO_PUBLIC_CPP_SHELL_CONNECT_H_

7	7

8 #include "mojo/public/cpp/bindings/allocation_scope.h"	8 #include "mojo/public/cpp/bindings/allocation_scope.h"

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

10	10

11 namespace mojo {	11 namespace mojo {

12	12

13 template <typename Interface>	13 template <typename Interface>

14 inline void ConnectTo(Shell* shell, const std::string& url,	14 inline void ConnectTo(Shell* shell, const std::string& url,

15 InterfacePtr<Interface>* ptr) {	15 InterfacePtr<Interface>* ptr) {

16 MessagePipe pipe;	16 MessagePipe pipe;

17 ptr->Bind(pipe.handle0.Pass());	17 ptr->Bind(pipe.handle0.Pass());

18	18

19 AllocationScope scope;	19 AllocationScope scope;

20 shell->Connect(url, pipe.handle1.Pass());	20 shell->Connect(url, pipe.handle1.Pass());

21 }	21 }

22	22

23 } // namespace mojo	23 } // namespace mojo

24	24

25 #endif // MOJO_PUBLIC_CPP_SHELL_CONNECT_H_	25 #endif // MOJO_PUBLIC_CPP_SHELL_CONNECT_H_

OLD	NEW