content/browser/android/java/java_type.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/java_type.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_script_to_java_types_coercion.cc ('k') | content/browser/android/java/java_type.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index ee8e01a8ae8e0b92408b4d07040048efef6e81a4..e5b9db53ffdf1eae053d140a9a14ac8136911352 100644

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

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

@@ -5,10 +5,10 @@

#ifndef CONTENT_BROWSER_ANDROID_JAVA_JAVA_TYPE_H_

#define CONTENT_BROWSER_ANDROID_JAVA_JAVA_TYPE_H_

+#include <memory>

#include <string>

#include "base/android/scoped_java_ref.h"

-#include "base/memory/scoped_ptr.h"

#include "content/common/content_export.h"

namespace content {

@@ -49,7 +49,7 @@ struct CONTENT_EXPORT JavaType {

};

Type type;

- scoped_ptr<JavaType> inner_type; // Used for TypeArray only.

+ std::unique_ptr<JavaType> inner_type; // Used for TypeArray only.

std::string class_jni_name; // Used for TypeString and TypeObject only.

base::android::ScopedJavaGlobalRef<jclass> class_ref; // TypeObject only.

};