chrome/browser/ui/cocoa/javascript_app_modal_dialog_cocoa.mm - 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/cocoa/javascript_app_modal_dialog_cocoa.mm

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

Index: chrome/browser/ui/cocoa/javascript_app_modal_dialog_cocoa.mm

diff --git a/chrome/browser/ui/cocoa/javascript_app_modal_dialog_cocoa.mm b/chrome/browser/ui/cocoa/javascript_app_modal_dialog_cocoa.mm

index a9c7a833c60f8dada5ee5327634d7a8fe5c0481c..40d6a95f4bb2829754bcf9a55cb999264a37e3da 100644

--- a/chrome/browser/ui/cocoa/javascript_app_modal_dialog_cocoa.mm

+++ b/chrome/browser/ui/cocoa/javascript_app_modal_dialog_cocoa.mm

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

#include "base/logging.h"

#import "base/mac/foundation_util.h"

#include "base/macros.h"

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

#include "base/strings/sys_string_conversions.h"

#import "chrome/browser/chrome_browser_application_mac.h"

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

@@ -471,7 +472,6 @@ class ChromeJavaScriptNativeDialogCocoaFactory

} // namespace

void InstallChromeJavaScriptNativeDialogFactory() {

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

- SetNativeDialogFactory(

- make_scoped_ptr(new ChromeJavaScriptNativeDialogCocoaFactory));

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

+ base::WrapUnique(new ChromeJavaScriptNativeDialogCocoaFactory));

}