[Merge-M54] arc: Use high-resolution icon for Play Store default item in app list.

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 "base/bind.h"
 #include "base/files/file_path.h"
@@ skipping 67 matching lines @@
 }
 
 ArcAppIcon::Source::~Source() {
 }
 
 gfx::ImageSkiaRep ArcAppIcon::Source::GetImageForScale(float scale) {
   if (host_)
     host_->LoadForScaleFactor(ui::GetSupportedScaleFactor(scale));
 
   // Host loads icon asynchronously, so use default icon so far.
-  const int resource_id = host_ && host_->app_id() == arc::kPlayStoreAppId ?
-      IDR_ARC_SUPPORT_ICON : IDR_APP_DEFAULT_ICON;
+  int resource_id;
+  if (host_ && host_->app_id() == arc::kPlayStoreAppId) {
+    resource_id = scale >= 1.5f ?
+        IDR_ARC_SUPPORT_ICON_48 : IDR_ARC_SUPPORT_ICON_96;
+  } else {
+    resource_id = IDR_APP_DEFAULT_ICON;
+  }
   const gfx::ImageSkia* default_image = ResourceBundle::GetSharedInstance().
       GetImageSkiaNamed(resource_id);
   CHECK(default_image);
   return gfx::ImageSkiaOperations::CreateResizedImage(
       *default_image,
       skia::ImageOperations::RESIZE_BEST,
       gfx::Size(resource_size_in_dip_, resource_size_in_dip_)).
           GetRepresentation(scale);
 }
 
@@ skipping 201 matching lines @@
 
 void ArcAppIcon::DiscardDecodeRequest(DecodeRequest* request) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
 
   ScopedVector<DecodeRequest>::iterator it = std::find(decode_requests_.begin(),
                                                        decode_requests_.end(),
                                                        request);
   CHECK(it != decode_requests_.end());
   decode_requests_.erase(it);
 }