| Index: chrome/browser/ui/views/chrome_javascript_native_dialog_factory_views.cc
|
| diff --git a/chrome/browser/ui/views/chrome_javascript_native_dialog_factory_views.cc b/chrome/browser/ui/views/chrome_javascript_native_dialog_factory_views.cc
|
| index 107e66c47c51e38488603103b9571160fd713eab..fbee839316e91e2e78268269e7ebc8e0f2a99931 100644
|
| --- a/chrome/browser/ui/views/chrome_javascript_native_dialog_factory_views.cc
|
| +++ b/chrome/browser/ui/views/chrome_javascript_native_dialog_factory_views.cc
|
| @@ -5,6 +5,7 @@
|
| #include "chrome/browser/ui/app_modal/chrome_javascript_native_dialog_factory.h"
|
|
|
| #include "base/macros.h"
|
| +#include "base/memory/ptr_util.h"
|
| #include "build/build_config.h"
|
| #include "components/app_modal/javascript_dialog_manager.h"
|
| #include "components/app_modal/javascript_native_dialog_factory.h"
|
| @@ -37,7 +38,7 @@ class ChromeJavaScriptAppModalDialogViews
|
| ~ChromeJavaScriptAppModalDialogViews() override {}
|
|
|
| private:
|
| - scoped_ptr<AppModalDialogHelper> helper_;
|
| + std::unique_ptr<AppModalDialogHelper> helper_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(ChromeJavaScriptAppModalDialogViews);
|
| };
|
| @@ -80,7 +81,6 @@ class ChromeJavaScriptNativeDialogViewsFactory
|
| } // namespace
|
|
|
| void InstallChromeJavaScriptNativeDialogFactory() {
|
| - app_modal::JavaScriptDialogManager::GetInstance()->
|
| - SetNativeDialogFactory(
|
| - make_scoped_ptr(new ChromeJavaScriptNativeDialogViewsFactory));
|
| + app_modal::JavaScriptDialogManager::GetInstance()->SetNativeDialogFactory(
|
| + base::WrapUnique(new ChromeJavaScriptNativeDialogViewsFactory));
|
| }
|
|
|