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

Unified Diff: chrome/browser/ui/views/harmony/chrome_typography.cc

Issue 2904823002: Inactive toast ux changes (Closed)
Patch Set: move run_loop_ to a unique_ptr Created 3 years, 4 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
Index: chrome/browser/ui/views/harmony/chrome_typography.cc
diff --git a/chrome/browser/ui/views/harmony/chrome_typography.cc b/chrome/browser/ui/views/harmony/chrome_typography.cc
index ddeb5633bdc94e94bf998639715c87dd7556a9c1..82ad88c58e35a33c2c168ffd71264023303f9890 100644
--- a/chrome/browser/ui/views/harmony/chrome_typography.cc
+++ b/chrome/browser/ui/views/harmony/chrome_typography.cc
@@ -4,8 +4,23 @@
#include "chrome/browser/ui/views/harmony/chrome_typography.h"
+#include "build/build_config.h"
#include "ui/base/default_style.h"
#include "ui/base/resource/resource_bundle.h"
+#include "ui/gfx/platform_font.h"
+
+void ApplyCommonFontStyles(int context,
+ int style,
+ int* size_delta,
+ gfx::Font::Weight* weight) {
+#if defined(OS_WIN)
+ if (context == CONTEXT_WINDOWS10_NATIVE) {
+ // Adjusts default font size up to match Win10 modern UI.
+ *size_delta = 15 - gfx::PlatformFont::kDefaultBaseFontSize;
+ *weight = views::TypographyProvider::MediumWeightForUI();
+ }
+#endif
+}
const gfx::FontList& LegacyTypographyProvider::GetFont(int context,
int style) const {
@@ -20,6 +35,8 @@ const gfx::FontList& LegacyTypographyProvider::GetFont(int context,
ash::ApplyAshFontStyles(context, style, &size_delta, &font_weight);
#endif
+ ApplyCommonFontStyles(context, style, &size_delta, &font_weight);
+
switch (context) {
case CONTEXT_HEADLINE:
size_delta = kHeadlineDelta;

Powered by Google App Engine
This is Rietveld 408576698