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

Unified Diff: ui/views/controls/button/md_text_button.cc

Issue 2758323002: Broke out layout metric information from ViewsDelegate to LayoutProvider (Closed)
Patch Set: Deleted LayoutDelegate and HarmonyLayoutDelegate. 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: ui/views/controls/button/md_text_button.cc
diff --git a/ui/views/controls/button/md_text_button.cc b/ui/views/controls/button/md_text_button.cc
index 4453f2a2aa72f428b0e7519f9061938bcb93d4fb..a0d1f2813aa30ca483a18d6214381f83c36bb3ed 100644
--- a/ui/views/controls/button/md_text_button.cc
+++ b/ui/views/controls/button/md_text_button.cc
@@ -19,9 +19,9 @@
#include "ui/views/border.h"
#include "ui/views/controls/button/blue_button.h"
#include "ui/views/controls/focus_ring.h"
+#include "ui/views/layout/views_layout_delegate.h"
#include "ui/views/painter.h"
#include "ui/views/style/platform_style.h"
-#include "ui/views/views_delegate.h"
namespace views {
@@ -193,7 +193,7 @@ MdTextButton::MdTextButton(ButtonListener* listener)
set_has_ink_drop_action_on_click(true);
SetHorizontalAlignment(gfx::ALIGN_CENTER);
SetFocusForPlatform();
- const int minimum_width = ViewsDelegate::GetInstance()->GetDistanceMetric(
+ const int minimum_width = ViewsLayoutDelegate::Get()->GetDistanceMetric(
DistanceMetric::DIALOG_BUTTON_MINIMUM_WIDTH);
SetMinSize(gfx::Size(minimum_width, 0));
SetFocusPainter(nullptr);
@@ -240,9 +240,8 @@ void MdTextButton::UpdatePadding() {
// TODO(estade): can we get rid of the platform style border hoopla if
// we apply the MD treatment to all buttons, even GTK buttons?
- const int horizontal_padding =
- ViewsDelegate::GetInstance()->GetDistanceMetric(
- DistanceMetric::BUTTON_HORIZONTAL_PADDING);
+ const int horizontal_padding = ViewsLayoutDelegate::Get()->GetDistanceMetric(
+ DistanceMetric::BUTTON_HORIZONTAL_PADDING);
SetBorder(CreateEmptyBorder(top_padding, horizontal_padding, bottom_padding,
horizontal_padding));
}

Powered by Google App Engine
This is Rietveld 408576698