Fix the problem with the TryChromeAgain toast appearing in the wrong place on scale factors other t…

chrome/browser/ui/views/try_chrome_dialog_view.cc

 // Copyright (c) 2012 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/views/try_chrome_dialog_view.h"
 
 #include <shellapi.h>
 
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "base/strings/string16.h"
 #include "chrome/browser/process_singleton.h"
 #include "chrome/browser/ui/views/harmony/chrome_layout_provider.h"
 #include "chrome/grit/chromium_strings.h"
 #include "chrome/grit/theme_resources.h"
 #include "chrome/install_static/install_util.h"
 #include "chrome/installer/util/user_experiment.h"
 #include "components/strings/grit/components_strings.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_tree_host.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/display/screen.h"
+#include "ui/display/win/screen_win.h"
 #include "ui/gfx/image/image.h"
 #include "ui/resources/grit/ui_resources.h"
 #include "ui/views/background.h"
 #include "ui/views/controls/button/checkbox.h"
 #include "ui/views/controls/button/image_button.h"
 #include "ui/views/controls/button/md_text_button.h"
 #include "ui/views/controls/button/radio_button.h"
 #include "ui/views/controls/image_view.h"
 #include "ui/views/controls/link.h"
 #include "ui/views/controls/separator.h"
@@ skipping 250 matching lines @@
     int separator_height = separator->GetPreferredSize().height();
     separator->SetSize(gfx::Size(preferred.width(), separator_height));
   }
 
   gfx::Rect pos = ComputeWindowPosition(preferred, base::i18n::IsRTL());
   popup_->SetBounds(pos);
 
   // Carve the toast shape into the window.
   HWND toast_window;
   toast_window = popup_->GetNativeView()->GetHost()->GetAcceleratedWidget();
-  SetToastRegion(toast_window, preferred.width(), preferred.height());
+
+  gfx::Size size_in_pixels = display::win::ScreenWin::DIPToScreenSize(
+      toast_window, preferred);
+  SetToastRegion(toast_window, size_in_pixels.width(),
+                 size_in_pixels.height());
 
   // Time to show the window in a modal loop.
   popup_->Show();
 
   if (!listener.is_null())
     listener.Run(popup_->GetNativeView());
 
   // If the dialog is not modal, we don't control when it is going to be
   // dismissed and hence we cannot inform the listener about the dialog going
   // away.
   if (dialog_type == kDialogType::MODAL) {
     base::RunLoop().Run();
     if (!listener.is_null())
       listener.Run(nullptr);
   }
   return result_;
 }
 
 gfx::Rect TryChromeDialogView::ComputeWindowPosition(const gfx::Size& size,
                                                      bool is_RTL) {
   gfx::Point origin;
 
   gfx::Rect work_area = popup_->GetWorkAreaBoundsInScreen();
   origin.set_x(is_RTL ? work_area.x() : work_area.right() - size.width());
   origin.set_y(work_area.bottom()- size.height());
 
-  return display::Screen::GetScreen()->ScreenToDIPRectInWindow(
-      popup_->GetNativeView(), gfx::Rect(origin, size));
+  return gfx::Rect(origin, size);
 }
 
 void TryChromeDialogView::SetToastRegion(HWND window, int w, int h) {
   static const POINT polygon[] = {
       {0, 4},     {1, 2},     {2, 1},     {4, 0},  // Left side.
       {w - 4, 0}, {w - 2, 1}, {w - 1, 2}, {w, 4},  // Right side.
       {w, h},     {0, h}};
   HRGN region = ::CreatePolygonRgn(polygon, arraysize(polygon), WINDING);
   ::SetWindowRgn(window, region, FALSE);
 }
@@ skipping 35 matching lines @@
       result_ = TRY_CHROME_AS_DEFAULT;
   }
 
   popup_->Close();
   base::MessageLoop::current()->QuitWhenIdle();
 }
 
 void TryChromeDialogView::LinkClicked(views::Link* source, int event_flags) {
   ::ShellExecuteW(NULL, L"open", kHelpCenterUrl, NULL, NULL, SW_SHOW);
 }