| Index: chrome/browser/ui/app_list/search/launcher_search/launcher_search_icon_image_loader.h
|
| diff --git a/chrome/browser/ui/app_list/search/launcher_search/launcher_search_icon_image_loader.h b/chrome/browser/ui/app_list/search/launcher_search/launcher_search_icon_image_loader.h
|
| index c52ce61b98e6a0691f697b97fbc11a5332c24098..fefa5f2c963355005f247fc204b3a8c1c6d46796 100644
|
| --- a/chrome/browser/ui/app_list/search/launcher_search/launcher_search_icon_image_loader.h
|
| +++ b/chrome/browser/ui/app_list/search/launcher_search/launcher_search_icon_image_loader.h
|
| @@ -7,8 +7,9 @@
|
|
|
| #include <stdint.h>
|
|
|
| +#include <memory>
|
| +
|
| #include "base/macros.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| #include "chrome/browser/chromeos/launcher_search_provider/error_reporter.h"
|
| #include "chrome/browser/profiles/profile.h"
|
| #include "extensions/common/extension.h"
|
| @@ -40,7 +41,7 @@ class LauncherSearchIconImageLoader {
|
| Profile* profile,
|
| const extensions::Extension* extension,
|
| const int icon_dimension,
|
| - scoped_ptr<chromeos::launcher_search_provider::ErrorReporter>
|
| + std::unique_ptr<chromeos::launcher_search_provider::ErrorReporter>
|
| error_reporter);
|
| virtual ~LauncherSearchIconImageLoader();
|
|
|
| @@ -90,7 +91,8 @@ class LauncherSearchIconImageLoader {
|
| // be larger than 3.
|
| std::string GetTruncatedIconUrl(const uint32_t max_size);
|
|
|
| - scoped_ptr<chromeos::launcher_search_provider::ErrorReporter> error_reporter_;
|
| + std::unique_ptr<chromeos::launcher_search_provider::ErrorReporter>
|
| + error_reporter_;
|
|
|
| gfx::ImageSkia extension_icon_image_;
|
| gfx::ImageSkia custom_icon_image_;
|
|
|