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

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

Issue 2865813002: arc: Prevent overwriting of the Chrome Play Store icon. (Closed)
Patch Set: discard image(), protect LoadImageForScaleFactor Created 3 years, 7 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.h ('k') | no next file » | 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.cc
diff --git a/chrome/browser/ui/app_list/arc/arc_app_icon.cc b/chrome/browser/ui/app_list/arc/arc_app_icon.cc
index d144fbca6aa8441a3c7fa043ee6bc7adf494c7c7..06a52ec6a5051a8a2843f9e0177627256c130754 100644
--- a/chrome/browser/ui/app_list/arc/arc_app_icon.cc
+++ b/chrome/browser/ui/app_list/arc/arc_app_icon.cc
@@ -258,10 +258,14 @@ ArcAppIcon::~ArcAppIcon() {
}
void ArcAppIcon::LoadForScaleFactor(ui::ScaleFactor scale_factor) {
- ArcAppListPrefs* prefs = ArcAppListPrefs::Get(context_);
+ // We provide Play Store icon from Chrome resources and it is not expected
+ // that we have external load request.
+ DCHECK_NE(app_id_, arc::kPlayStoreAppId);
+
+ const ArcAppListPrefs* const prefs = ArcAppListPrefs::Get(context_);
DCHECK(prefs);
- base::FilePath path = prefs->GetIconPath(app_id_, scale_factor);
+ const base::FilePath path = prefs->GetIconPath(app_id_, scale_factor);
if (path.empty())
return;
@@ -362,8 +366,6 @@ void ArcAppIcon::Update(const gfx::ImageSkia* image) {
}
}
- image_ = gfx::Image(image_skia_);
-
observer_->OnIconUpdated(this);
}
« no previous file with comments | « chrome/browser/ui/app_list/arc/arc_app_icon.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698