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

Unified Diff: chrome/browser/ui/views/extensions/media_gallery_checkbox_view.cc

Issue 2758323002: Broke out layout metric information from ViewsDelegate to LayoutProvider (Closed)
Patch Set: Fix various unit-tests 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/extensions/media_gallery_checkbox_view.cc
diff --git a/chrome/browser/ui/views/extensions/media_gallery_checkbox_view.cc b/chrome/browser/ui/views/extensions/media_gallery_checkbox_view.cc
index 0f36191be16b6afb8d4a7eb965e3de344f457e0e..d97133ed83d9382e31cd9af8ae3440cde00747e2 100644
--- a/chrome/browser/ui/views/extensions/media_gallery_checkbox_view.cc
+++ b/chrome/browser/ui/views/extensions/media_gallery_checkbox_view.cc
@@ -5,7 +5,7 @@
#include "chrome/browser/ui/views/extensions/media_gallery_checkbox_view.h"
#include "chrome/browser/media_galleries/media_galleries_preferences.h"
-#include "chrome/browser/ui/views/harmony/layout_delegate.h"
+#include "chrome/browser/ui/views/harmony/chrome_views_layout_delegate.h"
#include "third_party/skia/include/core/SkColor.h"
#include "ui/gfx/geometry/rect.h"
#include "ui/views/border.h"
@@ -30,9 +30,9 @@ MediaGalleryCheckboxView::MediaGalleryCheckboxView(
DCHECK(button_listener != NULL);
SetLayoutManager(
new views::BoxLayout(views::BoxLayout::kHorizontal, 0, 0, 0));
- LayoutDelegate* layout_delegate = LayoutDelegate::Get();
- const int border_horiz_margin =
- layout_delegate->GetMetric(LayoutDelegate::Metric::PANEL_CONTENT_MARGIN);
+ ChromeViewsLayoutDelegate* layout_delegate = ChromeViewsLayoutDelegate::Get();
+ const int border_horiz_margin = layout_delegate->GetDistanceMetric(
+ ChromeDistanceMetric::PANEL_CONTENT_MARGIN);
SetBorder(views::CreateEmptyBorder(
0, border_horiz_margin, trailing_vertical_space, border_horiz_margin));
if (menu_controller)
@@ -56,8 +56,8 @@ MediaGalleryCheckboxView::MediaGalleryCheckboxView(
secondary_text_->SetTooltipText(tooltip_text);
secondary_text_->SetBorder(views::CreateEmptyBorder(
0,
- layout_delegate->GetMetric(
- LayoutDelegate::Metric::RELATED_CONTROL_HORIZONTAL_SPACING_SMALL),
+ layout_delegate->GetDistanceMetric(
+ ChromeDistanceMetric::RELATED_CONTROL_HORIZONTAL_SMALL),
0, 0));
AddChildView(checkbox_);

Powered by Google App Engine
This is Rietveld 408576698