mojo/dbus/dbus_external_service.h - Issue 265793015: Mojo: Replace RemotePtr with InterfacePtr and InterfaceImpl

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: mojo/dbus/dbus_external_service.h

Issue 265793015: Mojo: Replace RemotePtr with InterfacePtr and InterfaceImpl (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: snapshot 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 unified diff | Download patch | Annotate | Revision Log

« no previous file with comments | « mojo/apps/js/test/js_to_cpp_unittest.cc ('k') | mojo/examples/aura_demo/aura_demo.cc » ('j') | mojo/public/tools/bindings/generators/cpp_templates/interface_declaration.tmpl » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 #include "base/memory/scoped_ptr.h"	5 #include "base/memory/scoped_ptr.h"

6 #include "dbus/bus.h"	6 #include "dbus/bus.h"

7 #include "dbus/exported_object.h"	7 #include "dbus/exported_object.h"

8 #include "dbus/message.h"	8 #include "dbus/message.h"

9 #include "dbus/object_path.h"	9 #include "dbus/object_path.h"

10 #include "mojo/common/channel_init.h"	10 #include "mojo/common/channel_init.h"

11 #include "mojo/public/cpp/bindings/interface.h"	11 #include "mojo/public/cpp/bindings/interface.h"

12 #include "mojo/public/cpp/bindings/remote_ptr.h"

13 #include "mojo/public/cpp/shell/application.h"	12 #include "mojo/public/cpp/shell/application.h"

14 #include "mojo/public/interfaces/shell/shell.mojom.h"	13 #include "mojo/public/interfaces/shell/shell.mojom.h"

15 #include "mojo/shell/external_service.mojom.h"	14 #include "mojo/shell/external_service.mojom.h"

16	15

17 namespace mojo {	16 namespace mojo {

18 const char kMojoDBusImplPath[] = "/org/chromium/MojoImpl";	17 const char kMojoDBusImplPath[] = "/org/chromium/MojoImpl";

19 const char kMojoDBusInterface[] = "org.chromium.Mojo";	18 const char kMojoDBusInterface[] = "org.chromium.Mojo";

20 const char kMojoDBusConnectMethod[] = "ConnectChannel";	19 const char kMojoDBusConnectMethod[] = "ConnectChannel";

21	20

22 class DBusExternalServiceBase : public mojo::ErrorHandler {	21 class DBusExternalServiceBase : public mojo::ErrorHandler {

(...skipping 53 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
76 mojo::ShellHandle(client_handle.release().value()));	75 mojo::ShellHandle(client_handle.release().value()));

77 app_.reset(new mojo::Application(shell_handle.Pass()));	76 app_.reset(new mojo::Application(shell_handle.Pass()));

78 app_->AddServiceConnector(new mojo::ServiceConnector<ServiceImpl>());	77 app_->AddServiceConnector(new mojo::ServiceConnector<ServiceImpl>());

79 }	78 }

80	79

81 mojo::RemotePtr<mojo::ExternalServiceHost> external_service_host_;	80 mojo::RemotePtr<mojo::ExternalServiceHost> external_service_host_;

82 scoped_ptr<mojo::Application> app_;	81 scoped_ptr<mojo::Application> app_;

83 };	82 };

84	83

85 } // namespace mojo	84 } // namespace mojo

OLD	NEW