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

Unified Diff: dbus/object_proxy.h

Issue 1867253002: Convert //dbus from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: IWYU fixes in //device Created 4 years, 8 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 | « dbus/object_manager_unittest.cc ('k') | dbus/object_proxy.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: dbus/object_proxy.h
diff --git a/dbus/object_proxy.h b/dbus/object_proxy.h
index 839d5f72dc785a1582a0e4471b55c426ea27b691..033e88608a095234d568eb559f09471ef0fa0b00 100644
--- a/dbus/object_proxy.h
+++ b/dbus/object_proxy.h
@@ -8,6 +8,7 @@
#include <dbus/dbus.h>
#include <map>
+#include <memory>
#include <set>
#include <string>
#include <vector>
@@ -15,7 +16,6 @@
#include "base/callback.h"
#include "base/macros.h"
#include "base/memory/ref_counted.h"
-#include "base/memory/scoped_ptr.h"
#include "base/strings/string_piece.h"
#include "base/time/time.h"
#include "dbus/dbus_export.h"
@@ -98,7 +98,7 @@ class CHROME_DBUS_EXPORT ObjectProxy
// in the |error| object.
//
// BLOCKING CALL.
- virtual scoped_ptr<Response> CallMethodAndBlockWithErrorDetails(
+ virtual std::unique_ptr<Response> CallMethodAndBlockWithErrorDetails(
MethodCall* method_call,
int timeout_ms,
ScopedDBusError* error);
@@ -107,8 +107,8 @@ class CHROME_DBUS_EXPORT ObjectProxy
// is returned. Returns NULL on error.
//
// BLOCKING CALL.
- virtual scoped_ptr<Response> CallMethodAndBlock(MethodCall* method_call,
- int timeout_ms);
+ virtual std::unique_ptr<Response> CallMethodAndBlock(MethodCall* method_call,
+ int timeout_ms);
// Requests to call the method of the remote object.
//
@@ -290,7 +290,8 @@ class CHROME_DBUS_EXPORT ObjectProxy
void UpdateNameOwnerAndBlock();
// Handles NameOwnerChanged signal from D-Bus's special message bus.
- DBusHandlerResult HandleNameOwnerChanged(scoped_ptr<dbus::Signal> signal);
+ DBusHandlerResult HandleNameOwnerChanged(
+ std::unique_ptr<dbus::Signal> signal);
// Runs |name_owner_changed_callback_|.
void RunNameOwnerChangedCallback(const std::string& old_owner,
« no previous file with comments | « dbus/object_manager_unittest.cc ('k') | dbus/object_proxy.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698