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

Side by Side Diff: views/layout/grid_layout.cc

Issue 6452011: Rework tree APIs to reflect Google style and more const-correctness.... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 9 years, 10 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "views/layout/grid_layout.h" 5 #include "views/layout/grid_layout.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "base/stl_util-inl.h" 10 #include "base/stl_util-inl.h"
(...skipping 942 matching lines...) Expand 10 before | Expand all | Expand 10 after
953 if (!calculated_master_columns_) { 953 if (!calculated_master_columns_) {
954 calculated_master_columns_ = true; 954 calculated_master_columns_ = true;
955 for (std::vector<ColumnSet*>::iterator i = column_sets_.begin(); 955 for (std::vector<ColumnSet*>::iterator i = column_sets_.begin();
956 i != column_sets_.end(); ++i) { 956 i != column_sets_.end(); ++i) {
957 (*i)->CalculateMasterColumns(); 957 (*i)->CalculateMasterColumns();
958 } 958 }
959 } 959 }
960 } 960 }
961 961
962 void GridLayout::AddViewState(ViewState* view_state) { 962 void GridLayout::AddViewState(ViewState* view_state) {
963 DCHECK(view_state->view && (view_state->view->GetParent() == NULL || 963 DCHECK(view_state->view && (view_state->view->parent() == NULL ||
964 view_state->view->GetParent() == host_)); 964 view_state->view->parent() == host_));
965 if (!view_state->view->GetParent()) { 965 if (!view_state->view->parent()) {
966 adding_view_ = true; 966 adding_view_ = true;
967 host_->AddChildView(view_state->view); 967 host_->AddChildView(view_state->view);
968 adding_view_ = false; 968 adding_view_ = false;
969 } 969 }
970 remaining_row_span_ = std::max(remaining_row_span_, view_state->row_span); 970 remaining_row_span_ = std::max(remaining_row_span_, view_state->row_span);
971 next_column_ += view_state->col_span; 971 next_column_ += view_state->col_span;
972 current_row_col_set_->AddViewState(view_state); 972 current_row_col_set_->AddViewState(view_state);
973 // view_states are ordered by row_span (in ascending order). 973 // view_states are ordered by row_span (in ascending order).
974 std::vector<ViewState*>::iterator i = lower_bound(view_states_.begin(), 974 std::vector<ViewState*>::iterator i = lower_bound(view_states_.begin(),
975 view_states_.end(), 975 view_states_.end(),
(...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after
1061 1061
1062 ColumnSet* GridLayout::GetLastValidColumnSet() { 1062 ColumnSet* GridLayout::GetLastValidColumnSet() {
1063 for (int i = current_row_ - 1; i >= 0; --i) { 1063 for (int i = current_row_ - 1; i >= 0; --i) {
1064 if (rows_[i]->column_set()) 1064 if (rows_[i]->column_set())
1065 return rows_[i]->column_set(); 1065 return rows_[i]->column_set();
1066 } 1066 }
1067 return NULL; 1067 return NULL;
1068 } 1068 }
1069 1069
1070 } // namespace views 1070 } // namespace views
OLDNEW
« no previous file with comments | « views/layout/fill_layout.cc ('k') | views/layout/grid_layout_unittest.cc » ('j') | views/view.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698