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

Unified Diff: ui/views/mus/aura_init.cc

Issue 2758323002: Broke out layout metric information from ViewsDelegate to LayoutProvider (Closed)
Patch Set: Changes due to feedback. Created 3 years, 8 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: ui/views/mus/aura_init.cc
diff --git a/ui/views/mus/aura_init.cc b/ui/views/mus/aura_init.cc
index fe7406ccf782b713366af090c6bb3c01baa2a31f..192bb7ffa4a279f0c08d4b6f9596870f258524dd 100644
--- a/ui/views/mus/aura_init.cc
+++ b/ui/views/mus/aura_init.cc
@@ -19,6 +19,7 @@
#include "ui/base/material_design/material_design_controller.h"
#include "ui/base/resource/resource_bundle.h"
#include "ui/base/ui_base_paths.h"
+#include "ui/views/layout/layout_delegate.h"
#include "ui/views/mus/mus_client.h"
#include "ui/views/style/typography_provider.h"
#include "ui/views/views_delegate.h"
@@ -44,11 +45,7 @@ class MusViewsDelegate : public ViewsDelegate {
Widget::InitParams* params,
internal::NativeWidgetDelegate* delegate) override {}
- const TypographyProvider& GetTypographyProvider() const override {
- return typography_provider_;
- }
-
- DefaultTypographyProvider typography_provider_;
+ LayoutDelegate layout_delegate_;
DISALLOW_COPY_AND_ASSIGN(MusViewsDelegate);
};

Powered by Google App Engine
This is Rietveld 408576698