arc: Prevent overwriting of the Chrome Play Store icon.

chrome/browser/ui/app_list/arc/arc_app_icon.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/app_list/arc/arc_app_icon.h"
 
 #include <algorithm>
 #include <map>
 #include <memory>
 #include <utility>
@@ skipping 234 matching lines @@
                        Observer* observer)
     : context_(context),
       app_id_(GetAppFromAppOrGroupId(context, app_id)),
       resource_size_in_dip_(resource_size_in_dip),
       observer_(observer),
       weak_ptr_factory_(this) {
   CHECK(observer_ != nullptr);
   source_ = new Source(weak_ptr_factory_.GetWeakPtr(), resource_size_in_dip);
   gfx::Size resource_size(resource_size_in_dip, resource_size_in_dip);
   image_skia_ = gfx::ImageSkia(source_, resource_size);
+  image_ = gfx::Image(image_skia_);

[khmel, 2017/05/06 01:03:36]

This fixes yet another problem, when in case somebody access ARC icon as image()
it does not contain default image (for Play Store icon this is Chrome version of
Play Store).

[xiyuan, 2017/05/08 16:15:13]

Get rid of this member and make image() to do the construction when it is called
? Or make the caller to do this by themselves?

[khmel, 2017/05/08 16:36:07]

Yes, it is rather confusing than helpful.
Discarded image()

 }
 
 ArcAppIcon::~ArcAppIcon() {
 }
 
 void ArcAppIcon::LoadForScaleFactor(ui::ScaleFactor scale_factor) {

[khmel, 2017/05/06 01:03:36]

LoadForScaleFactor is internal ARC Icon function and it is not intended to be
used by ordinary consumer. Only ArcAppIconLoader and ArcModelBuilder has right
to call this. Agree that looks bit confusing. I will try to refactor this
probably similar as my current refactoring for extension icons).

[xiyuan, 2017/05/08 16:15:13]

Make this private and make ArcAppIconLoader/ArcModelBuilder friend to limit the
access ?

[khmel, 2017/05/08 16:36:07]

Done.

-  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;
 
   base::PostTaskWithTraitsAndReplyWithResult(
       FROM_HERE, {base::MayBlock(), base::TaskPriority::BACKGROUND},
       base::Bind(&ArcAppIcon::ReadOnFileThread, scale_factor, path,
                  prefs->MaybeGetIconPathForDefaultApp(app_id_, scale_factor)),
       base::Bind(&ArcAppIcon::OnIconRead, weak_ptr_factory_.GetWeakPtr()));
 }
 
@@ skipping 95 matching lines @@
 void ArcAppIcon::DiscardDecodeRequest(DecodeRequest* request) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
 
   auto it = std::find_if(decode_requests_.begin(), decode_requests_.end(),
                          [request](const std::unique_ptr<DecodeRequest>& ptr) {
                            return ptr.get() == request;
                          });
   CHECK(it != decode_requests_.end());
   decode_requests_.erase(it);
 }