Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(743)

Side by Side Diff: mojo/dbus/dbus_external_service.cc

Issue 423613002: Mojo: split up service_provider.mojom (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 6 years, 4 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/dbus/dbus_external_service.h ('k') | mojo/examples/aura_demo/aura_demo.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 "mojo/dbus/dbus_external_service.h" 5 #include "mojo/dbus/dbus_external_service.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/callback.h" 8 #include "base/callback.h"
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "base/memory/scoped_ptr.h" 10 #include "base/memory/scoped_ptr.h"
11 #include "base/message_loop/message_loop_proxy.h" 11 #include "base/message_loop/message_loop_proxy.h"
12 #include "dbus/bus.h" 12 #include "dbus/bus.h"
13 #include "dbus/exported_object.h" 13 #include "dbus/exported_object.h"
14 #include "dbus/file_descriptor.h" 14 #include "dbus/file_descriptor.h"
15 #include "dbus/message.h" 15 #include "dbus/message.h"
16 #include "dbus/object_path.h" 16 #include "dbus/object_path.h"
17 #include "mojo/embedder/channel_init.h" 17 #include "mojo/embedder/channel_init.h"
18 #include "mojo/public/cpp/bindings/error_handler.h" 18 #include "mojo/public/cpp/bindings/error_handler.h"
19 #include "mojo/public/interfaces/service_provider/service_provider.mojom.h"
20 #include "mojo/shell/external_service.mojom.h" 19 #include "mojo/shell/external_service.mojom.h"
21 20
22 namespace mojo { 21 namespace mojo {
23 22
24 DBusExternalServiceBase::DBusExternalServiceBase( 23 DBusExternalServiceBase::DBusExternalServiceBase(
25 const std::string& service_name) 24 const std::string& service_name)
26 : service_name_(service_name), 25 : service_name_(service_name),
27 exported_object_(NULL) { 26 exported_object_(NULL) {
28 } 27 }
29 DBusExternalServiceBase::~DBusExternalServiceBase() {} 28 DBusExternalServiceBase::~DBusExternalServiceBase() {}
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
80 } 79 }
81 80
82 void DBusExternalServiceBase::TakeDBusServiceOwnership() { 81 void DBusExternalServiceBase::TakeDBusServiceOwnership() {
83 CHECK(bus_->RequestOwnershipAndBlock( 82 CHECK(bus_->RequestOwnershipAndBlock(
84 service_name_, 83 service_name_,
85 dbus::Bus::REQUIRE_PRIMARY_ALLOW_REPLACEMENT)) 84 dbus::Bus::REQUIRE_PRIMARY_ALLOW_REPLACEMENT))
86 << "Unable to take ownership of " << service_name_; 85 << "Unable to take ownership of " << service_name_;
87 } 86 }
88 87
89 } // namespace mojo 88 } // namespace mojo
OLDNEW
« no previous file with comments | « mojo/dbus/dbus_external_service.h ('k') | mojo/examples/aura_demo/aura_demo.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698