chrome/browser/ui/views/cookie_info_view.cc - Issue 2758323002: Broke out layout metric information from ViewsDelegate to LayoutProvider

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/views/cookie_info_view.cc

Issue 2758323002: Broke out layout metric information from ViewsDelegate to LayoutProvider (Closed)

Patch Set: Final feedback addressed 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

« no previous file with comments | « chrome/browser/ui/views/content_setting_bubble_contents.cc ('k') | chrome/browser/ui/views/desktop_capture/desktop_media_picker_views.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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..e0638f7db3230707d92094e37392de5aefc16784 100644

--- a/chrome/browser/ui/views/cookie_info_view.cc

+++ b/chrome/browser/ui/views/cookie_info_view.cc

@@ -12,7 +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/layout_delegate.h"

+#include "chrome/browser/ui/views/harmony/chrome_layout_provider.h"

#include "chrome/grit/generated_resources.h"

#include "net/cookies/canonical_cookie.h"

#include "third_party/skia/include/core/SkColor.h"

@@ -147,23 +147,20 @@ 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));

+ ChromeLayoutProvider* provider = ChromeLayoutProvider::Get();

+ int dialog_button_margin =

+ provider->GetDistanceMetric(DISTANCE_DIALOG_BUTTON_MARGIN);

+ layout->SetInsets(0, dialog_button_margin, 0, dialog_button_margin);

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(provider->GetControlLabelGridAlignment(),

views::GridLayout::CENTER, 0,

views::GridLayout::USE_PREF, 0, 0);

column_set->AddPaddingColumn(

- LayoutDelegate::Get()->GetMetric(

- LayoutDelegate::Metric::RELATED_CONTROL_HORIZONTAL_SPACING));

+ provider->GetDistanceMetric(views::DISTANCE_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,