chrome/browser/ui/android/connection_info_popup_android.h - Issue 1865213004: Convert //chrome/browser/ui 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: chrome/browser/ui/android/connection_info_popup_android.h

Issue 1865213004: Convert //chrome/browser/ui from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: rebase 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 | « chrome/browser/ui/android/autofill/credit_card_scanner_view_android.cc ('k') | chrome/browser/ui/android/content_settings/popup_blocked_infobar_delegate.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/android/connection_info_popup_android.h

diff --git a/chrome/browser/ui/android/connection_info_popup_android.h b/chrome/browser/ui/android/connection_info_popup_android.h

index 1055ed7f39bb5649f34bc5f3f83d93355369a758..00203a46263cde510503cf7b5f77f4675d0adf9c 100644

--- a/chrome/browser/ui/android/connection_info_popup_android.h

+++ b/chrome/browser/ui/android/connection_info_popup_android.h

@@ -7,9 +7,10 @@

#include <jni.h>

+#include <memory>

#include "base/android/scoped_java_ref.h"

#include "base/macros.h"

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

#include "chrome/browser/ui/website_settings/website_settings_ui.h"

namespace content {

@@ -45,7 +46,7 @@ class ConnectionInfoPopupAndroid : public WebsiteSettingsUI {

private:

// The presenter that controlls the Website Settings UI.

- scoped_ptr<WebsiteSettings> presenter_;

+ std::unique_ptr<WebsiteSettings> presenter_;

// The java prompt implementation.

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