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

Unified Diff: chrome/browser/chromeos/file_system_provider/notification_manager.h

Issue 1870793002: Convert //chrome/browser/chromeos 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
Index: chrome/browser/chromeos/file_system_provider/notification_manager.h
diff --git a/chrome/browser/chromeos/file_system_provider/notification_manager.h b/chrome/browser/chromeos/file_system_provider/notification_manager.h
index eefb108be7ccdc92de48bce91d0b9bb3d912bb0c..8f3d7a4f4ad4e5d7f2582eabe32f0fe361ced1c5 100644
--- a/chrome/browser/chromeos/file_system_provider/notification_manager.h
+++ b/chrome/browser/chromeos/file_system_provider/notification_manager.h
@@ -6,11 +6,11 @@
#define CHROME_BROWSER_CHROMEOS_FILE_SYSTEM_PROVIDER_NOTIFICATION_MANAGER_H_
#include <map>
+#include <memory>
#include <string>
#include "base/callback.h"
#include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
#include "chrome/browser/chromeos/file_system_provider/notification_manager_interface.h"
#include "chrome/browser/chromeos/file_system_provider/provided_file_system_info.h"
#include "chrome/browser/ui/app_icon_loader.h"
@@ -59,7 +59,7 @@ class NotificationManager : public NotificationManagerInterface,
typedef std::map<int, NotificationCallback> CallbackMap;
// Creates a notification object for the actual state of the manager.
- scoped_ptr<message_center::Notification> CreateNotification();
+ std::unique_ptr<message_center::Notification> CreateNotification();
// Handles a notification result by calling all registered callbacks and
// clearing the list.
@@ -68,8 +68,8 @@ class NotificationManager : public NotificationManagerInterface,
Profile* profile_;
ProvidedFileSystemInfo file_system_info_;
CallbackMap callbacks_;
- scoped_ptr<AppIconLoader> icon_loader_;
- scoped_ptr<gfx::Image> extension_icon_;
+ std::unique_ptr<AppIconLoader> icon_loader_;
+ std::unique_ptr<gfx::Image> extension_icon_;
DISALLOW_COPY_AND_ASSIGN(NotificationManager);
};

Powered by Google App Engine
This is Rietveld 408576698