Index: chrome/browser/ui/views/frame/browser_desktop_window_tree_host_win.cc |
diff --git a/chrome/browser/ui/views/frame/browser_desktop_window_tree_host_win.cc b/chrome/browser/ui/views/frame/browser_desktop_window_tree_host_win.cc |
index 20d64e9867f11170e98b2945c3e98950bf3d1cd1..3387e7740634088677a36111dfb689ba247114e8 100644 |
--- a/chrome/browser/ui/views/frame/browser_desktop_window_tree_host_win.cc |
+++ b/chrome/browser/ui/views/frame/browser_desktop_window_tree_host_win.cc |
@@ -20,7 +20,7 @@ |
#include "chrome/browser/ui/views/theme_image_mapper.h" |
#include "chrome/common/chrome_constants.h" |
#include "ui/base/theme_provider.h" |
-#include "ui/gfx/win/dpi.h" |
+#include "ui/gfx/screen_win.h" |
#include "ui/views/controls/menu/native_menu_win.h" |
#pragma comment(lib, "dwmapi.lib") |
@@ -320,7 +320,8 @@ MARGINS BrowserDesktopWindowTreeHostWin::GetDWMFrameMargins() const { |
if (!browser_view_->IsFullscreen()) { |
gfx::Rect tabstrip_bounds( |
browser_frame_->GetBoundsForTabStrip(browser_view_->tabstrip())); |
- tabstrip_bounds = gfx::win::DIPToScreenRect(tabstrip_bounds); |
+ tabstrip_bounds = gfx::ScreenWin::DIPToClientRect(GetHWND(), |
sky
2015/10/29 15:51:50
Is there a reason for changing the name of these f
robliao
2015/11/07 00:56:40
When I audited this function, I found the calculat
|
+ tabstrip_bounds); |
margins.cyTopHeight = tabstrip_bounds.bottom(); |
// On pre-Win 10, we need to offset the DWM frame into the toolbar so that |