| Index: chrome/browser/banners/app_banner_manager.cc
|
| diff --git a/chrome/browser/banners/app_banner_manager.cc b/chrome/browser/banners/app_banner_manager.cc
|
| index d9f4521a90fe18e816f9707c282c539715f49e64..94bd769582445d6e9bf726e07789dc06ff535f20 100644
|
| --- a/chrome/browser/banners/app_banner_manager.cc
|
| +++ b/chrome/browser/banners/app_banner_manager.cc
|
| @@ -33,23 +33,17 @@ 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;
|
|
|
| @@ -192,14 +186,12 @@ std::string AppBannerManager::GetStatusParam(InstallableStatusCode code) {
|
| 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() {
|
| @@ -250,8 +242,8 @@ void AppBannerManager::PerformInstallableCheck() {
|
| return;
|
|
|
| // Fetch and verify the other required information.
|
| - manager_->GetData(ParamsToPerformInstallableCheck(GetIdealIconSizeInDp(),
|
| - GetMinimumIconSizeInDp()),
|
| + manager_->GetData(ParamsToPerformInstallableCheck(GetIdealIconSizeInPx(),
|
| + GetMinimumIconSizeInPx()),
|
| base::Bind(&AppBannerManager::OnDidPerformInstallableCheck,
|
| GetWeakPtr()));
|
| }
|
|
|