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

Side by Side Diff: ui/views/controls/scroll_view_unittest.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/scroll_view.h" 5 #include "ui/views/controls/scroll_view.h"
6 6
7 #include "base/macros.h"
7 #include "testing/gtest/include/gtest/gtest.h" 8 #include "testing/gtest/include/gtest/gtest.h"
8 #include "ui/views/controls/scrollbar/overlay_scroll_bar.h" 9 #include "ui/views/controls/scrollbar/overlay_scroll_bar.h"
9 #include "ui/views/test/test_views.h" 10 #include "ui/views/test/test_views.h"
10 11
11 namespace views { 12 namespace views {
12 13
13 namespace { 14 namespace {
14 15
15 const int kWidth = 100; 16 const int kWidth = 100;
16 const int kMinHeight = 50; 17 const int kMinHeight = 50;
(...skipping 350 matching lines...) Expand 10 before | Expand all | Expand 10 after
367 EXPECT_FALSE(corner_view->parent()); 368 EXPECT_FALSE(corner_view->parent());
368 369
369 // Corner view should reappear when both scrollbars reappear. 370 // Corner view should reappear when both scrollbars reappear.
370 contents->SetBounds(0, 0, 200, 200); 371 contents->SetBounds(0, 0, 200, 200);
371 scroll_view.Layout(); 372 scroll_view.Layout();
372 EXPECT_EQ(&scroll_view, corner_view->parent()); 373 EXPECT_EQ(&scroll_view, corner_view->parent());
373 EXPECT_TRUE(corner_view->visible()); 374 EXPECT_TRUE(corner_view->visible());
374 } 375 }
375 376
376 } // namespace views 377 } // namespace views
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698