Use exact pixel sizes instead of dip in webapp/WebAPK installability code

chrome/browser/banners/app_banner_manager.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/banners/app_banner_manager.h"
 
 #include <algorithm>
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/command_line.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/time/time.h"
 #include "chrome/browser/banners/app_banner_metrics.h"
 #include "chrome/browser/banners/app_banner_settings_helper.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/engagement/site_engagement_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/chrome_switches.h"
 #include "components/rappor/public/rappor_utils.h"
 #include "components/rappor/rappor_service_impl.h"
 #include "content/public/browser/navigation_handle.h"
 #include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/origin_util.h"
 #include "mojo/public/cpp/bindings/interface_request.h"
 #include "services/service_manager/public/cpp/interface_provider.h"
 #include "third_party/WebKit/public/platform/modules/installation/installation.mojom.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/display/display.h"

[dominickn, 2016/12/20 00:00:10]

Remove display.h and screen.h includes.

[pkotwicz, 2016/12/20 00:28:14]

Done.

 #include "ui/display/screen.h"
 
 namespace {
 
 int gCurrentRequestID = -1;
 int gTimeDeltaInDaysForTesting = 0;
 
-// Returns |size_in_px| in dp, i.e. divided by the current device scale factor.
-int ConvertIconSizeFromPxToDp(int size_in_px) {
-  return size_in_px /
-      display::Screen::GetScreen()->GetPrimaryDisplay().device_scale_factor();
-}
-
 InstallableParams ParamsToGetManifest() {
   return InstallableParams();
 }
 
 // Returns an InstallableParams object that requests all checks necessary for
 // a web app banner.
-InstallableParams ParamsToPerformInstallableCheck(int ideal_icon_size_in_dp,
-                                                  int minimum_icon_size_in_dp) {
+InstallableParams ParamsToPerformInstallableCheck(int ideal_icon_size_in_px,
+                                                  int minimum_icon_size_in_px) {
   InstallableParams params;
-  params.ideal_icon_size_in_dp = ideal_icon_size_in_dp;
-  params.minimum_icon_size_in_dp = minimum_icon_size_in_dp;
+  params.ideal_icon_size_in_px = ideal_icon_size_in_px;
+  params.minimum_icon_size_in_px = minimum_icon_size_in_px;
   params.check_installable = true;
   params.fetch_valid_icon = true;
 
   return params;
 }
 
 }  // anonymous namespace
 
 namespace banners {
 
@@ skipping 130 matching lines @@
 }
 
 std::string AppBannerManager::GetStatusParam(InstallableStatusCode code) {
   if (code == NO_ACCEPTABLE_ICON || code == MANIFEST_MISSING_SUITABLE_ICON) {
     return base::IntToString(InstallableManager::GetMinimumIconSizeInPx());
   }
 
   return std::string();
 }
 
-int AppBannerManager::GetIdealIconSizeInDp() {
-  return ConvertIconSizeFromPxToDp(
-      InstallableManager::GetMinimumIconSizeInPx());
+int AppBannerManager::GetIdealIconSizeInPx() {
+  return InstallableManager::GetMinimumIconSizeInPx();
 }
 
-int AppBannerManager::GetMinimumIconSizeInDp() {
-  return ConvertIconSizeFromPxToDp(
-      InstallableManager::GetMinimumIconSizeInPx());
+int AppBannerManager::GetMinimumIconSizeInPx() {
+  return InstallableManager::GetMinimumIconSizeInPx();
 }
 
 base::WeakPtr<AppBannerManager> AppBannerManager::GetWeakPtr() {
   return weak_factory_.GetWeakPtr();
 }
 
 bool AppBannerManager::IsDebugMode() const {
   return is_debug_mode_ ||
          base::CommandLine::ForCurrentProcess()->HasSwitch(
              switches::kBypassAppBannerEngagementChecks);
@@ skipping 30 matching lines @@
                         manifest_.start_url) &&
       !IsDebugMode()) {
     ReportStatus(web_contents(), ALREADY_INSTALLED);
     Stop();
   }
 
   if (!is_active_)
     return;
 
   // Fetch and verify the other required information.
-  manager_->GetData(ParamsToPerformInstallableCheck(GetIdealIconSizeInDp(),
-                                                    GetMinimumIconSizeInDp()),
+  manager_->GetData(ParamsToPerformInstallableCheck(GetIdealIconSizeInPx(),
+                                                    GetMinimumIconSizeInPx()),
                     base::Bind(&AppBannerManager::OnDidPerformInstallableCheck,
                                GetWeakPtr()));
 }
 
 void AppBannerManager::OnDidPerformInstallableCheck(
     const InstallableData& data) {
   if (data.is_installable)
     TrackDisplayEvent(DISPLAY_EVENT_WEB_APP_BANNER_REQUESTED);
 
   if (data.error_code != NO_ERROR_DETECTED) {
@@ skipping 270 matching lines @@
     // Simulate a non-canceled OnBannerPromptReply to show the delayed banner.
     // Don't reset |was_canceled_by_page_| yet for metrics purposes.
     OnBannerPromptReply(blink::mojom::AppBannerPromptReply::NONE, referrer_);
   } else {
     // Log that the prompt request was made for when we get the prompt reply.
     page_requested_prompt_ = true;
   }
 }
 
 }  // namespace banners