Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(66)

Unified Diff: components/app_modal/javascript_dialog_manager.h

Issue 1921973002: Convert //components/[a-e]* 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 | « no previous file | components/app_modal/javascript_dialog_manager.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/app_modal/javascript_dialog_manager.h
diff --git a/components/app_modal/javascript_dialog_manager.h b/components/app_modal/javascript_dialog_manager.h
index 0a797a579fdfd633cfbaa0af627a103b3be7e85c..626057da6e96f3b8a7f5423e7870fa0ab4e7be99 100644
--- a/components/app_modal/javascript_dialog_manager.h
+++ b/components/app_modal/javascript_dialog_manager.h
@@ -5,8 +5,9 @@
#ifndef COMPONENTS_APP_MODAL_JAVASCRIPT_DIALOG_MANAGER_H_
#define COMPONENTS_APP_MODAL_JAVASCRIPT_DIALOG_MANAGER_H_
+#include <memory>
+
#include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
#include "base/memory/singleton.h"
#include "base/time/time.h"
#include "components/app_modal/javascript_app_modal_dialog.h"
@@ -28,13 +29,13 @@ class JavaScriptDialogManager : public content::JavaScriptDialogManager {
// Sets the JavaScriptNativeDialogFactory used to create platform specific
// dialog window instances.
void SetNativeDialogFactory(
- scoped_ptr<JavaScriptNativeDialogFactory> factory);
+ std::unique_ptr<JavaScriptNativeDialogFactory> factory);
// JavaScript dialogs may be opened by an extensions/app, thus they need
// access to extensions functionality. This sets a client interface to
// access //extensions.
void SetExtensionsClient(
- scoped_ptr<JavaScriptDialogExtensionsClient> extensions_client);
+ std::unique_ptr<JavaScriptDialogExtensionsClient> extensions_client);
private:
friend struct base::DefaultSingletonTraits<JavaScriptDialogManager>;
@@ -81,8 +82,8 @@ class JavaScriptDialogManager : public content::JavaScriptDialogManager {
// is a void* because the pointer is just a cookie and is never dereferenced.
JavaScriptAppModalDialog::ExtraDataMap javascript_dialog_extra_data_;
- scoped_ptr<JavaScriptNativeDialogFactory> native_dialog_factory_;
- scoped_ptr<JavaScriptDialogExtensionsClient> extensions_client_;
+ std::unique_ptr<JavaScriptNativeDialogFactory> native_dialog_factory_;
+ std::unique_ptr<JavaScriptDialogExtensionsClient> extensions_client_;
// Record a single create and close timestamp to track the time between
// dialogs. (Since Javascript dialogs are modal, this is even accurate!)
« no previous file with comments | « no previous file | components/app_modal/javascript_dialog_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698