content/browser/web_contents/web_contents_view_android.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/web_contents/web_contents_view_android.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/web_contents/web_contents_user_data_unittest.cc ('k') | content/browser/web_contents/web_contents_view_aura.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/web_contents/web_contents_view_android.h

diff --git a/content/browser/web_contents/web_contents_view_android.h b/content/browser/web_contents/web_contents_view_android.h

index 6b135dc214cd0b89da51b6180a39a5e5a574d8aa..925f5bbb1213d2943b7c34661550730123a59163 100644

--- a/content/browser/web_contents/web_contents_view_android.h

+++ b/content/browser/web_contents/web_contents_view_android.h

@@ -5,8 +5,9 @@

#ifndef CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_VIEW_ANDROID_H_

#define CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_VIEW_ANDROID_H_

+#include <memory>

#include "base/macros.h"

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

#include "content/browser/renderer_host/render_view_host_delegate_view.h"

#include "content/browser/web_contents/web_contents_view.h"

#include "content/public/browser/web_contents_view_delegate.h"

@@ -83,7 +84,7 @@ class WebContentsViewAndroid : public WebContentsView,

ContentViewCoreImpl* content_view_core_;

// Interface for extensions to WebContentsView. Used to show the context menu.

- scoped_ptr<WebContentsViewDelegate> delegate_;

+ std::unique_ptr<WebContentsViewDelegate> delegate_;

DISALLOW_COPY_AND_ASSIGN(WebContentsViewAndroid);

};