NOT FOR SUBMIT - Windows Views HiDPI

chrome/browser/ui/views/frame/browser_view.cc

 // Copyright 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/frame/browser_view.h"
 
 #include <algorithm>
 
 #include "base/auto_reset.h"
 #include "base/command_line.h"
@@ skipping 126 matching lines @@
 #include "ui/gfx/screen.h"
 #elif defined(OS_WIN)  // !defined(USE_AURA)
 #include "chrome/browser/jumplist_win.h"
 #include "chrome/browser/ui/views/omnibox/omnibox_view_win.h"
 #include "ui/views/widget/native_widget_win.h"
 #include "ui/views/win/scoped_fullscreen_visibility.h"
 #endif
 
 #if defined(OS_WIN)
 #include "base/win/windows_version.h"
+#include "ui/base/win/dpi.h"
 #include "win8/util/win8_util.h"
 #endif
 
 #if defined(ENABLE_ONE_CLICK_SIGNIN)
 #include "chrome/browser/ui/views/sync/one_click_signin_bubble_view.h"
 #endif
 
 using base::TimeDelta;
 using content::NativeWebKeyboardEvent;
 using content::SSLStatus;
@@ skipping 663 matching lines @@
 void BrowserView::SetStarredState(bool is_starred) {
   GetLocationBarView()->SetStarToggled(is_starred);
 }
 
 void BrowserView::ZoomChangedForActiveTab(bool can_show_bubble) {
   GetLocationBarView()->ZoomChangedForActiveTab(
       can_show_bubble && !toolbar_->IsWrenchMenuShowing());
 }
 
 gfx::Rect BrowserView::GetRestoredBounds() const {
+#if defined(OS_WIN)
+  gfx::Rect bounds_in_pixels = frame_->GetRestoredBounds();
+  return ui::win::ScreenToDIPRect(bounds_in_pixels);
+#else
   return frame_->GetRestoredBounds();
+#endif
 }
 
 ui::WindowShowState BrowserView::GetRestoredState() const {
   if (IsMaximized())
     return ui::SHOW_STATE_MAXIMIZED;
   if (IsMinimized())
     return ui::SHOW_STATE_MINIMIZED;
   return ui::SHOW_STATE_NORMAL;
 }
 
 gfx::Rect BrowserView::GetBounds() const {
+#if defined(OS_WIN)
+  gfx::Rect bounds_in_pixels = frame_->GetWindowBoundsInScreen();
+  return ui::win::ScreenToDIPRect(bounds_in_pixels);
+#else
   return frame_->GetWindowBoundsInScreen();
+#endif
 }
 
 bool BrowserView::IsMaximized() const {
   return frame_->IsMaximized();
 }
 
 bool BrowserView::IsMinimized() const {
   return frame_->IsMinimized();
 }
 
@@ skipping 1905 matching lines @@
     // The +1 in the next line creates a 1-px gap between icon and arrow tip.
     gfx::Point icon_bottom(0, location_icon_view->GetImageBounds().bottom() -
         LocationBarView::kIconInternalPadding + 1);
     ConvertPointToTarget(location_icon_view, this, &icon_bottom);
     gfx::Point infobar_top(0, infobar_container_->GetVerticalOverlap(NULL));
     ConvertPointToTarget(infobar_container_, this, &infobar_top);
     top_arrow_height = infobar_top.y() - icon_bottom.y();
   }
   return top_arrow_height;
 }