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

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

Issue 7342047: Cleanup base/stl_util (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: removed unneeded include + rebase Created 9 years, 5 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.h"
11 #include "ui/gfx/insets.h" 11 #include "ui/gfx/insets.h"
12 #include "views/layout/layout_constants.h" 12 #include "views/layout/layout_constants.h"
13 #include "views/view.h" 13 #include "views/view.h"
14 14
15 namespace views { 15 namespace views {
16 16
17 // LayoutElement ------------------------------------------------------ 17 // LayoutElement ------------------------------------------------------
18 18
19 // A LayoutElement has a size and location along one axis. It contains 19 // A LayoutElement has a size and location along one axis. It contains
20 // methods that are used along both axis. 20 // methods that are used along both axis.
(...skipping 1040 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

Powered by Google App Engine
This is Rietveld 408576698