| Index: chrome/browser/ui/views/cookie_info_view.cc
|
| diff --git a/chrome/browser/ui/views/cookie_info_view.cc b/chrome/browser/ui/views/cookie_info_view.cc
|
| index cd736fe2e6bd8e69ef00a434f5d8ca9537238dd0..9868e251b8edd2cbe193a7bf7e0dd7badb671f31 100644
|
| --- a/chrome/browser/ui/views/cookie_info_view.cc
|
| +++ b/chrome/browser/ui/views/cookie_info_view.cc
|
| @@ -12,6 +12,7 @@
|
| #include "base/strings/string_util.h"
|
| #include "base/strings/utf_string_conversions.h"
|
| #include "chrome/browser/browsing_data/cookies_tree_model.h"
|
| +#include "chrome/browser/ui/views/harmony/chrome_views_layout_delegate.h"
|
| #include "chrome/browser/ui/views/harmony/layout_delegate.h"
|
| #include "chrome/grit/generated_resources.h"
|
| #include "net/cookies/canonical_cookie.h"
|
| @@ -147,23 +148,19 @@ void CookieInfoView::Init() {
|
| expires_value_field_ = new views::Textfield;
|
|
|
| views::GridLayout* layout = new views::GridLayout(this);
|
| - layout->SetInsets(0,
|
| - LayoutDelegate::Get()->GetMetric(
|
| - LayoutDelegate::Metric::DIALOG_BUTTON_MARGIN),
|
| - 0,
|
| - LayoutDelegate::Get()->GetMetric(
|
| - LayoutDelegate::Metric::DIALOG_BUTTON_MARGIN));
|
| + ChromeViewsLayoutDelegate* layout_delegate = ChromeViewsLayoutDelegate::Get();
|
| + layout->SetInsets(
|
| + layout_delegate->GetInsetsMetric(ChromeInsetsMetric::DIALOG_BUTTON));
|
| SetLayoutManager(layout);
|
|
|
| int three_column_layout_id = 0;
|
| views::ColumnSet* column_set = layout->AddColumnSet(three_column_layout_id);
|
| - column_set->AddColumn(LayoutDelegate::Get()->GetControlLabelGridAlignment(),
|
| + column_set->AddColumn(layout_delegate->GetControlLabelGridAlignment(),
|
| views::GridLayout::CENTER, 0,
|
| views::GridLayout::USE_PREF, 0, 0);
|
| column_set->AddPaddingColumn(
|
| - 0,
|
| - LayoutDelegate::Get()->GetMetric(
|
| - LayoutDelegate::Metric::RELATED_CONTROL_HORIZONTAL_SPACING));
|
| + 0, layout_delegate->GetDistanceMetric(
|
| + ChromeDistanceMetric::RELATED_CONTROL_HORIZONTAL));
|
| column_set->AddColumn(views::GridLayout::TRAILING, views::GridLayout::CENTER,
|
| 0, views::GridLayout::USE_PREF, 0, 0);
|
| column_set->AddColumn(views::GridLayout::FILL, views::GridLayout::CENTER,
|
|
|