Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(59)

Unified Diff: chrome/browser/ui/views/status_bubble_views.cc

Issue 14348033: NOT FOR SUBMIT - Windows Views HiDPI (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Revert spurious changes, plus some corrections. Created 7 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/ui/views/frame/browser_view.cc ('k') | chrome/browser/ui/views/tabs/dragged_tab_view.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/views/status_bubble_views.cc
diff --git a/chrome/browser/ui/views/status_bubble_views.cc b/chrome/browser/ui/views/status_bubble_views.cc
index bb141cadc1a366b270bdbd4c42bb6cd11d70b6be..d77e463dbc7cde08b23913e302b64360925cdef1 100644
--- a/chrome/browser/ui/views/status_bubble_views.cc
+++ b/chrome/browser/ui/views/status_bubble_views.cc
@@ -25,6 +25,7 @@
#include "ui/base/text/text_elider.h"
#include "ui/base/theme_provider.h"
#include "ui/gfx/canvas.h"
+#include "ui/gfx/font.h"
#include "ui/gfx/point.h"
#include "ui/gfx/screen.h"
#include "ui/gfx/skia_util.h"
@@ -38,6 +39,10 @@
#include "ash/wm/property_util.h"
#endif
+#if defined(OS_WIN)
+#include "ui/base/win/dpi.h"
+#endif
+
// The alpha and color of the bubble's shadow.
static const SkColor kShadowColor = SkColorSetARGB(30, 0, 0, 0);
@@ -90,7 +95,12 @@ class StatusBubbleViews::StatusView : public views::Label,
opacity_end_(0),
theme_service_(theme_provider) {
ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
+#if defined(OS_WIN)
+ SetFont(rb.GetFont(ui::ResourceBundle::BaseFont).DeriveFontScaled(
+ ui::win::GetDeviceScaleFactor()));
+#else
SetFont(rb.GetFont(ui::ResourceBundle::BaseFont));
+#endif
}
virtual ~StatusView() {
« no previous file with comments | « chrome/browser/ui/views/frame/browser_view.cc ('k') | chrome/browser/ui/views/tabs/dragged_tab_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698