| Index: chrome/browser/extensions/api/file_system/request_file_system_notification.h
|
| diff --git a/chrome/browser/extensions/api/file_system/request_file_system_notification.h b/chrome/browser/extensions/api/file_system/request_file_system_notification.h
|
| index d98d7ee1fc5d9e55b94b775d777f9c86f8d17ea7..25285313d43a18756fb7d26812fefa1c9f26044a 100644
|
| --- a/chrome/browser/extensions/api/file_system/request_file_system_notification.h
|
| +++ b/chrome/browser/extensions/api/file_system/request_file_system_notification.h
|
| @@ -5,11 +5,11 @@
|
| #ifndef CHROME_BROWSER_EXTENSIONS_API_FILE_SYSTEM_REQUEST_FILE_SYSTEM_NOTIFICATION_H_
|
| #define CHROME_BROWSER_EXTENSIONS_API_FILE_SYSTEM_REQUEST_FILE_SYSTEM_NOTIFICATION_H_
|
|
|
| +#include <memory>
|
| #include <string>
|
|
|
| #include "base/callback.h"
|
| #include "base/macros.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| #include "base/memory/weak_ptr.h"
|
| #include "chrome/browser/ui/app_icon_loader.h"
|
| #include "ui/message_center/notification_delegate.h"
|
| @@ -51,15 +51,15 @@ class RequestFileSystemNotification
|
| ~RequestFileSystemNotification() override;
|
|
|
| // Shows the notification. Can be called only once.
|
| - void Show(scoped_ptr<message_center::Notification> notification);
|
| + void Show(std::unique_ptr<message_center::Notification> notification);
|
|
|
| // AppIconLoaderDelegate overrides:
|
| void OnAppImageUpdated(const std::string& id,
|
| const gfx::ImageSkia& image) override;
|
|
|
| - scoped_ptr<AppIconLoader> icon_loader_;
|
| - scoped_ptr<gfx::Image> extension_icon_;
|
| - scoped_ptr<message_center::Notification> pending_notification_;
|
| + std::unique_ptr<AppIconLoader> icon_loader_;
|
| + std::unique_ptr<gfx::Image> extension_icon_;
|
| + std::unique_ptr<message_center::Notification> pending_notification_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(RequestFileSystemNotification);
|
| };
|
|
|