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

Unified Diff: content/renderer/java/gin_java_bridge_dispatcher.h

Issue 1873783003: Convert //content/renderer from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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
Index: content/renderer/java/gin_java_bridge_dispatcher.h
diff --git a/content/renderer/java/gin_java_bridge_dispatcher.h b/content/renderer/java/gin_java_bridge_dispatcher.h
index 05e1427e0030e4ebced95b15d48c3046cecd973f..f795c288f7842ca9cfcc35e84f8f2931e851fad4 100644
--- a/content/renderer/java/gin_java_bridge_dispatcher.h
+++ b/content/renderer/java/gin_java_bridge_dispatcher.h
@@ -6,11 +6,11 @@
#define CONTENT_RENDERER_JAVA_GIN_JAVA_BRIDGE_DISPATCHER_H_
#include <map>
+#include <memory>
#include <set>
#include "base/id_map.h"
#include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
#include "base/memory/weak_ptr.h"
#include "base/values.h"
#include "content/common/android/gin_java_bridge_errors.h"
@@ -50,10 +50,11 @@ class GinJavaBridgeDispatcher
void GetJavaMethods(ObjectID object_id, std::set<std::string>* methods);
bool HasJavaMethod(ObjectID object_id, const std::string& method_name);
- scoped_ptr<base::Value> InvokeJavaMethod(ObjectID object_id,
- const std::string& method_name,
- const base::ListValue& arguments,
- GinJavaBridgeError* error);
+ std::unique_ptr<base::Value> InvokeJavaMethod(
+ ObjectID object_id,
+ const std::string& method_name,
+ const base::ListValue& arguments,
+ GinJavaBridgeError* error);
GinJavaBridgeObject* GetObject(ObjectID object_id);
void OnGinJavaBridgeObjectDeleted(GinJavaBridgeObject* object);
« no previous file with comments | « content/renderer/internal_document_state_data.h ('k') | content/renderer/java/gin_java_bridge_dispatcher.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698