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

Unified Diff: chrome/browser/ui/app_list/arc/arc_app_icon_loader.cc

Issue 1865213004: Convert //chrome/browser/ui 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
« no previous file with comments | « chrome/browser/ui/app_list/arc/arc_app_icon_loader.h ('k') | chrome/browser/ui/app_list/arc/arc_app_item.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/app_list/arc/arc_app_icon_loader.cc
diff --git a/chrome/browser/ui/app_list/arc/arc_app_icon_loader.cc b/chrome/browser/ui/app_list/arc/arc_app_icon_loader.cc
index 4e53b608d11ec86843fc137e50c1ebb2c9fdb905..a6b097eb7403018346242311d9bc2239b136b89f 100644
--- a/chrome/browser/ui/app_list/arc/arc_app_icon_loader.cc
+++ b/chrome/browser/ui/app_list/arc/arc_app_icon_loader.cc
@@ -33,10 +33,8 @@ void ArcAppIconLoader::FetchImage(const std::string& app_id) {
// Note, ARC icon is available only for 48x48 dips. In case |icon_size_|
// differs from this size, re-scale is required.
- scoped_ptr<ArcAppIcon> icon(new ArcAppIcon(profile(),
- app_id,
- app_list::kGridIconDimension,
- this));
+ std::unique_ptr<ArcAppIcon> icon(
+ new ArcAppIcon(profile(), app_id, app_list::kGridIconDimension, this));
icon->image_skia().EnsureRepsForSupportedScales();
icon_map_[app_id] = std::move(icon);
UpdateImage(app_id);
@@ -51,7 +49,7 @@ void ArcAppIconLoader::UpdateImage(const std::string& app_id) {
if (it == icon_map_.end())
return;
- scoped_ptr<ArcAppListPrefs::AppInfo> app_info =
+ std::unique_ptr<ArcAppListPrefs::AppInfo> app_info =
ArcAppListPrefs::Get(profile())->GetApp(app_id);
if (!app_info || !app_info->ready) {
delegate()->OnAppImageUpdated(app_id,
« no previous file with comments | « chrome/browser/ui/app_list/arc/arc_app_icon_loader.h ('k') | chrome/browser/ui/app_list/arc/arc_app_item.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698