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

Unified Diff: chrome/browser/ui/views/website_settings/website_settings_popup_view.cc

Issue 2713803002: Views/Harmony: Use LayoutDelegate::GetMetric for views::kPanelVertMargin. (Closed)
Patch Set: Rebase. 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
« no previous file with comments | « chrome/browser/ui/views/webshare/webshare_target_picker_view.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/views/website_settings/website_settings_popup_view.cc
diff --git a/chrome/browser/ui/views/website_settings/website_settings_popup_view.cc b/chrome/browser/ui/views/website_settings/website_settings_popup_view.cc
index afd6fe99263041f45d549314517808a09f20c987..98b2ed0ea369fbc066cb184acd0e75e4852b95b7 100644
--- a/chrome/browser/ui/views/website_settings/website_settings_popup_view.cc
+++ b/chrome/browser/ui/views/website_settings/website_settings_popup_view.cc
@@ -22,6 +22,7 @@
#include "chrome/browser/ui/browser_dialogs.h"
#include "chrome/browser/ui/layout_constants.h"
#include "chrome/browser/ui/views/collected_cookies_views.h"
+#include "chrome/browser/ui/views/harmony/layout_delegate.h"
#include "chrome/browser/ui/views/website_settings/chosen_object_row.h"
#include "chrome/browser/ui/views/website_settings/non_accessible_image_view.h"
#include "chrome/browser/ui/views/website_settings/permission_selector_row.h"
@@ -54,7 +55,6 @@
#include "ui/views/controls/styled_label.h"
#include "ui/views/layout/box_layout.h"
#include "ui/views/layout/grid_layout.h"
-#include "ui/views/layout/layout_constants.h"
#include "ui/views/layout/layout_manager.h"
#include "ui/views/view.h"
#include "ui/views/widget/widget.h"
@@ -81,7 +81,7 @@ const int kMaxPopupWidth = 1000;
// Margin and padding values for the |PopupHeaderView|.
const int kHeaderMarginBottom = 10;
-const int kHeaderPaddingBottom = views::kPanelVertMargin;
+const int kHeaderPaddingBottom = 13;
// Spacing between labels in the header.
const int kHeaderLabelSpacing = 4;
@@ -439,7 +439,9 @@ WebsiteSettingsPopupView::WebsiteSettingsPopupView(
// In non-material, titles are inset from the dialog margin. Ensure the
// horizontal insets match.
set_title_margins(
- gfx::Insets(views::kPanelVertMargin, side_margin, 0, side_margin));
+ gfx::Insets(LayoutDelegate::Get()->GetMetric(
+ LayoutDelegate::Metric::PANEL_CONTENT_MARGIN),
+ side_margin, 0, side_margin));
}
views::BubbleDialogDelegateView::CreateBubble(this);
« no previous file with comments | « chrome/browser/ui/views/webshare/webshare_target_picker_view.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698