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

Side by Side Diff: ui/views/controls/single_split_view.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/controls/single_split_view.h" 5 #include "ui/views/controls/single_split_view.h"
6 6
7 #include "build/build_config.h"
7 #include "ui/accessibility/ax_view_state.h" 8 #include "ui/accessibility/ax_view_state.h"
8 #include "ui/base/cursor/cursor.h" 9 #include "ui/base/cursor/cursor.h"
9 #include "ui/gfx/canvas.h" 10 #include "ui/gfx/canvas.h"
10 #include "ui/views/background.h" 11 #include "ui/views/background.h"
11 #include "ui/views/controls/single_split_view_listener.h" 12 #include "ui/views/controls/single_split_view_listener.h"
12 #include "ui/views/native_cursor.h" 13 #include "ui/views/native_cursor.h"
13 14
14 #if defined(OS_WIN) 15 #if defined(OS_WIN)
15 #include "skia/ext/skia_utils_win.h" 16 #include "skia/ext/skia_utils_win.h"
16 #endif 17 #endif
(...skipping 230 matching lines...) Expand 10 before | Expand all | Expand 10 after
247 const gfx::Rect& bounds) const { 248 const gfx::Rect& bounds) const {
248 int primary_axis_size = GetPrimaryAxisSize(bounds.width(), bounds.height()); 249 int primary_axis_size = GetPrimaryAxisSize(bounds.width(), bounds.height());
249 if (divider_offset < 0) 250 if (divider_offset < 0)
250 // primary_axis_size may < GetDividerSize during initial layout. 251 // primary_axis_size may < GetDividerSize during initial layout.
251 return std::max(0, (primary_axis_size - GetDividerSize()) / 2); 252 return std::max(0, (primary_axis_size - GetDividerSize()) / 2);
252 return std::min(divider_offset, 253 return std::min(divider_offset,
253 std::max(primary_axis_size - GetDividerSize(), 0)); 254 std::max(primary_axis_size - GetDividerSize(), 0));
254 } 255 }
255 256
256 } // namespace views 257 } // namespace views
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698