diff options
| author | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-20 01:36:53 +0000 |
|---|---|---|
| committer | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-20 01:36:53 +0000 |
| commit | 200328ab0dcebf5869a63fb891a58c3e39768b12 (patch) | |
| tree | 16325243683583f306a51c05ca0c44518b4af1b2 /chromeos | |
| parent | 044512594122e2feb1fb78bd96b59a300c98a253 (diff) | |
| download | chromium_src-200328ab0dcebf5869a63fb891a58c3e39768b12.zip chromium_src-200328ab0dcebf5869a63fb891a58c3e39768b12.tar.gz chromium_src-200328ab0dcebf5869a63fb891a58c3e39768b12.tar.bz2 | |
DBus: Use TaskRunners instead of MessageLoopProxies.
Review URL: https://chromiumcodereview.appspot.com/12255043
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@183362 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chromeos')
| -rw-r--r-- | chromeos/dbus/blocking_method_caller.cc | 1 | ||||
| -rw-r--r-- | chromeos/dbus/dbus_thread_manager.cc | 6 |
2 files changed, 3 insertions, 4 deletions
diff --git a/chromeos/dbus/blocking_method_caller.cc b/chromeos/dbus/blocking_method_caller.cc index 5fc0c9a..3c288f1 100644 --- a/chromeos/dbus/blocking_method_caller.cc +++ b/chromeos/dbus/blocking_method_caller.cc @@ -5,6 +5,7 @@ #include "chromeos/dbus/blocking_method_caller.h" #include "base/bind.h" +#include "base/location.h" #include "base/threading/thread_restrictions.h" #include "dbus/bus.h" #include "dbus/object_proxy.h" diff --git a/chromeos/dbus/dbus_thread_manager.cc b/chromeos/dbus/dbus_thread_manager.cc index 3c998c1..07ed761 100644 --- a/chromeos/dbus/dbus_thread_manager.cc +++ b/chromeos/dbus/dbus_thread_manager.cc @@ -72,8 +72,7 @@ class DBusThreadManagerImpl : public DBusThreadManager { dbus::Bus::Options system_bus_options; system_bus_options.bus_type = dbus::Bus::SYSTEM; system_bus_options.connection_type = dbus::Bus::PRIVATE; - system_bus_options.dbus_thread_message_loop_proxy = - dbus_thread_->message_loop_proxy(); + system_bus_options.dbus_task_runner = dbus_thread_->message_loop_proxy(); system_bus_ = new dbus::Bus(system_bus_options); bluetooth_manager_client_.reset(BluetoothManagerClient::Create( @@ -169,8 +168,7 @@ class DBusThreadManagerImpl : public DBusThreadManager { ibus_bus_options.bus_type = dbus::Bus::CUSTOM_ADDRESS; ibus_bus_options.address = ibus_address; ibus_bus_options.connection_type = dbus::Bus::PRIVATE; - ibus_bus_options.dbus_thread_message_loop_proxy = - dbus_thread_->message_loop_proxy(); + ibus_bus_options.dbus_task_runner = dbus_thread_->message_loop_proxy(); ibus_bus_ = new dbus::Bus(ibus_bus_options); ibus_address_ = ibus_address; VLOG(1) << "Connected to ibus-daemon: " << ibus_address; |