chrome/browser/ui/android/javascript_app_modal_dialog_android.cc - 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/javascript_app_modal_dialog_android.cc

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/javascript_app_modal_dialog_android.h ('k') | chrome/browser/ui/android/login_handler_android.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/android/javascript_app_modal_dialog_android.cc

diff --git a/chrome/browser/ui/android/javascript_app_modal_dialog_android.cc b/chrome/browser/ui/android/javascript_app_modal_dialog_android.cc

index b56bf489f565ed43c26c4f5712e87d3ea15085fc..8218c1006ecaddc29dccb54db8eda1a2d8ba3918 100644

--- a/chrome/browser/ui/android/javascript_app_modal_dialog_android.cc

+++ b/chrome/browser/ui/android/javascript_app_modal_dialog_android.cc

@@ -7,6 +7,7 @@

#include "base/android/jni_android.h"

#include "base/android/jni_string.h"

#include "base/macros.h"

+#include "base/memory/ptr_util.h"

#include "chrome/browser/ui/app_modal/chrome_javascript_native_dialog_factory.h"

#include "components/app_modal/app_modal_dialog_queue.h"

#include "components/app_modal/javascript_app_modal_dialog.h"

@@ -195,8 +196,7 @@ class ChromeJavaScriptNativeDialogAndroidFactory

} // namespace

void InstallChromeJavaScriptNativeDialogFactory() {

- app_modal::JavaScriptDialogManager::GetInstance()->

- SetNativeDialogFactory(

- make_scoped_ptr(new ChromeJavaScriptNativeDialogAndroidFactory));

+ app_modal::JavaScriptDialogManager::GetInstance()->SetNativeDialogFactory(

+ base::WrapUnique(new ChromeJavaScriptNativeDialogAndroidFactory));

}