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

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

Issue 2734113006: "Bootstrap" a toolkit-views Typography spec. (Closed)
Patch Set: Rebase (conflict in layout_delegate.h due to r457774) Created 3 years, 9 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/layout_delegate.cc
diff --git a/chrome/browser/ui/views/harmony/layout_delegate.cc b/chrome/browser/ui/views/harmony/layout_delegate.cc
index b376576bd8bb1c89199b297ccd5d62955fc2a9cc..9f5dad1e175abe692836ea344311bd536bbf88fe 100644
--- a/chrome/browser/ui/views/harmony/layout_delegate.cc
+++ b/chrome/browser/ui/views/harmony/layout_delegate.cc
@@ -7,6 +7,7 @@
#include "base/lazy_instance.h"
#include "base/logging.h"
#include "chrome/browser/ui/views/chrome_views_delegate.h"
+#include "chrome/browser/ui/views/harmony/chrome_typography.h"
#include "chrome/browser/ui/views/harmony/harmony_layout_delegate.h"
#include "ui/base/material_design/material_design_controller.h"
#include "ui/views/layout/layout_constants.h"
@@ -88,3 +89,10 @@ bool LayoutDelegate::IsHarmonyMode() const {
int LayoutDelegate::GetDialogPreferredWidth(DialogWidth width) const {
return 0;
}
+
+const views::TypographyProvider& LayoutDelegate::GetTypographyProvider() const {
+ // This is not a data member because then HarmonyLayoutDelegate would inherit
+ // it, even when it provides its own.
+ CR_DEFINE_STATIC_LOCAL(LegacyTypographyProvider, legacy_provider, ());
+ return legacy_provider;
+}

Powered by Google App Engine
This is Rietveld 408576698