diff options
author | erg@chromium.org <erg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-17 03:46:49 +0000 |
---|---|---|
committer | erg@chromium.org <erg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-17 03:46:49 +0000 |
commit | 639fdc443d6e231c831e264dc7242305299f1451 (patch) | |
tree | aff2fc2b31f528e5ce4e71a002050eef4c877cb5 /ui/views/layout | |
parent | 1914193f05458d7645cefbe8b96303e62706de0f (diff) | |
download | chromium_src-639fdc443d6e231c831e264dc7242305299f1451.zip chromium_src-639fdc443d6e231c831e264dc7242305299f1451.tar.gz chromium_src-639fdc443d6e231c831e264dc7242305299f1451.tar.bz2 |
scythe: Delete dead code in views code.
BUG=none
Review URL: https://codereview.chromium.org/235613003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@264390 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/views/layout')
-rw-r--r-- | ui/views/layout/grid_layout.cc | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/ui/views/layout/grid_layout.cc b/ui/views/layout/grid_layout.cc index 9466c51..e28a1b7 100644 --- a/ui/views/layout/grid_layout.cc +++ b/ui/views/layout/grid_layout.cc @@ -162,7 +162,6 @@ class Column : public LayoutElement { GridLayout::SizeType size_type, int fixed_width, int min_width, - size_t index, bool is_padding) : LayoutElement(resize_percent), h_align_(h_align), @@ -171,7 +170,6 @@ class Column : public LayoutElement { same_size_column_(-1), fixed_width_(fixed_width), min_width_(min_width), - index_(index), is_padding_(is_padding), master_column_(NULL) {} @@ -201,9 +199,6 @@ class Column : public LayoutElement { const int fixed_width_; const int min_width_; - // Index of this column in the ColumnSet. - const size_t index_; - const bool is_padding_; // If multiple columns have their sizes linked, one is the @@ -264,10 +259,8 @@ void Column::AdjustSize(int size) { class Row : public LayoutElement { public: - Row(bool fixed_height, int height, float resize_percent, - ColumnSet* column_set) + Row(int height, float resize_percent, ColumnSet* column_set) : LayoutElement(resize_percent), - fixed_height_(fixed_height), height_(height), column_set_(column_set), max_ascent_(0), @@ -301,7 +294,6 @@ class Row : public LayoutElement { } private: - const bool fixed_height_; const int height_; // The column set used for this row; null for padding rows. ColumnSet* column_set_; @@ -422,8 +414,7 @@ void ColumnSet::AddColumn(GridLayout::Alignment h_align, int min_width, bool is_padding) { Column* column = new Column(h_align, v_align, resize_percent, size_type, - fixed_width, min_width, columns_.size(), - is_padding); + fixed_width, min_width, is_padding); columns_.push_back(column); } @@ -718,11 +709,11 @@ void GridLayout::StartRowWithPadding(float vertical_resize, int column_set_id, void GridLayout::StartRow(float vertical_resize, int column_set_id) { ColumnSet* column_set = GetColumnSet(column_set_id); DCHECK(column_set); - AddRow(new Row(false, 0, vertical_resize, column_set)); + AddRow(new Row(0, vertical_resize, column_set)); } void GridLayout::AddPaddingRow(float vertical_resize, int pixel_count) { - AddRow(new Row(true, pixel_count, vertical_resize, NULL)); + AddRow(new Row(pixel_count, vertical_resize, NULL)); } void GridLayout::SkipColumns(int col_count) { |