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

Unified Diff: ui/views/layout/grid_layout.h

Issue 2859193004: Remove GridLayout::SetInsets in favor of an empty border on the host. (Closed)
Patch Set: missed a merge problem Created 3 years, 7 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 | « ui/message_center/views/message_center_view_unittest.cc ('k') | ui/views/layout/grid_layout.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/layout/grid_layout.h
diff --git a/ui/views/layout/grid_layout.h b/ui/views/layout/grid_layout.h
index 197d101705caa195f5fd7c98fc20ab973187dc93..66d9f65a99591e60064e349c30ed1a09a96eae3b 100644
--- a/ui/views/layout/grid_layout.h
+++ b/ui/views/layout/grid_layout.h
@@ -11,7 +11,6 @@
#include <vector>
#include "base/macros.h"
-#include "ui/gfx/geometry/insets.h"
#include "ui/gfx/geometry/size.h"
#include "ui/views/layout/layout_manager.h"
@@ -104,13 +103,10 @@ class VIEWS_EXPORT GridLayout : public LayoutManager {
explicit GridLayout(View* host);
~GridLayout() override;
- // Creates a GridLayout with kPanel*Margin insets.
+ // Creates a GridLayout, assigns it as the LayoutManager of |host|, and gives
+ // it a INSETS_PANEL-sized padding border.
static GridLayout* CreatePanel(View* host);
- // Sets the insets. All views are placed relative to these offsets.
- void SetInsets(int top, int left, int bottom, int right);
- void SetInsets(const gfx::Insets& insets);
-
// Creates a new column set with the specified id and returns it.
// The id is later used when starting a new row.
// GridLayout takes ownership of the ColumnSet and will delete it when
@@ -239,9 +235,6 @@ class VIEWS_EXPORT GridLayout : public LayoutManager {
// Column set for the current row. This is null for padding rows.
ColumnSet* current_row_col_set_;
- // Insets.
- gfx::Insets insets_;
-
// Set to true when adding a View.
bool adding_view_;
« no previous file with comments | « ui/message_center/views/message_center_view_unittest.cc ('k') | ui/views/layout/grid_layout.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698