content/browser/android/java/gin_java_method_invocation_helper.h - Issue 1874893002: Convert //content/browser from scoped_ptr to std::unique_ptr

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

Unified Diff: content/browser/android/java/gin_java_method_invocation_helper.h

Issue 1874893002: Convert //content/browser 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

« no previous file with comments | « content/browser/android/java/gin_java_bridge_dispatcher_host.cc ('k') | content/browser/android/java/gin_java_method_invocation_helper.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/android/java/gin_java_method_invocation_helper.h

diff --git a/content/browser/android/java/gin_java_method_invocation_helper.h b/content/browser/android/java/gin_java_method_invocation_helper.h

index b61fdfd68ebfd9bfc4334983ad7cf2d22513b6d6..b2c0992eaa4d17ef315f6bbe42d580cf6ae89a6f 100644

--- a/content/browser/android/java/gin_java_method_invocation_helper.h

+++ b/content/browser/android/java/gin_java_method_invocation_helper.h

@@ -55,7 +55,7 @@ class CONTENT_EXPORT GinJavaMethodInvocationHelper

DISALLOW_COPY_AND_ASSIGN(ObjectDelegate);

};

- GinJavaMethodInvocationHelper(scoped_ptr<ObjectDelegate> object,

+ GinJavaMethodInvocationHelper(std::unique_ptr<ObjectDelegate> object,

const std::string& method_name,

const base::ListValue& arguments);

void Init(DispatcherDelegate* dispatcher);

@@ -94,12 +94,12 @@ class CONTENT_EXPORT GinJavaMethodInvocationHelper

typedef std::map<GinJavaBoundObject::ObjectID,

JavaObjectWeakGlobalRef> ObjectRefs;

- scoped_ptr<ObjectDelegate> object_;

+ std::unique_ptr<ObjectDelegate> object_;

const std::string method_name_;

- scoped_ptr<base::ListValue> arguments_;

+ std::unique_ptr<base::ListValue> arguments_;

ObjectRefs object_refs_;

bool holds_primitive_result_;

- scoped_ptr<base::ListValue> primitive_result_;

+ std::unique_ptr<base::ListValue> primitive_result_;

GinJavaBridgeError invocation_error_;

base::android::ScopedJavaGlobalRef<jobject> object_result_;

base::android::ScopedJavaGlobalRef<jclass> safe_annotation_clazz_;