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

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

Issue 1543173002: Switch to standard integer types in ui/views/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 12 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
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "ui/views/layout/grid_layout.h" 5 #include "ui/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/macros.h"
10 #include "base/stl_util.h" 11 #include "base/stl_util.h"
11 #include "ui/views/layout/layout_constants.h" 12 #include "ui/views/layout/layout_constants.h"
12 #include "ui/views/view.h" 13 #include "ui/views/view.h"
13 #include "ui/views/window/dialog_delegate.h" 14 #include "ui/views/window/dialog_delegate.h"
14 15
15 namespace views { 16 namespace views {
16 17
17 // LayoutElement ------------------------------------------------------ 18 // LayoutElement ------------------------------------------------------
18 19
19 // A LayoutElement has a size and location along one axis. It contains 20 // A LayoutElement has a size and location along one axis. It contains
(...skipping 1034 matching lines...) Expand 10 before | Expand all | Expand 10 after
1054 1055
1055 ColumnSet* GridLayout::GetLastValidColumnSet() { 1056 ColumnSet* GridLayout::GetLastValidColumnSet() {
1056 for (int i = current_row_ - 1; i >= 0; --i) { 1057 for (int i = current_row_ - 1; i >= 0; --i) {
1057 if (rows_[i]->column_set()) 1058 if (rows_[i]->column_set())
1058 return rows_[i]->column_set(); 1059 return rows_[i]->column_set();
1059 } 1060 }
1060 return NULL; 1061 return NULL;
1061 } 1062 }
1062 1063
1063 } // namespace views 1064 } // namespace views
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698