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

Side by Side Diff: ui/views/controls/styled_label_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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 <stddef.h>
6
5 #include <string> 7 #include <string>
6 8
7 #include "base/basictypes.h" 9 #include "base/macros.h"
8 #include "base/memory/scoped_ptr.h" 10 #include "base/memory/scoped_ptr.h"
9 #include "base/strings/utf_string_conversions.h" 11 #include "base/strings/utf_string_conversions.h"
10 #include "testing/gtest/include/gtest/gtest.h" 12 #include "testing/gtest/include/gtest/gtest.h"
11 #include "third_party/skia/include/core/SkColor.h" 13 #include "third_party/skia/include/core/SkColor.h"
12 #include "ui/gfx/font_list.h" 14 #include "ui/gfx/font_list.h"
13 #include "ui/views/border.h" 15 #include "ui/views/border.h"
14 #include "ui/views/controls/link.h" 16 #include "ui/views/controls/link.h"
15 #include "ui/views/controls/styled_label.h" 17 #include "ui/views/controls/styled_label.h"
16 #include "ui/views/controls/styled_label_listener.h" 18 #include "ui/views/controls/styled_label_listener.h"
17 #include "ui/views/test/views_test_base.h" 19 #include "ui/views/test/views_test_base.h"
(...skipping 469 matching lines...) Expand 10 before | Expand all | Expand 10 after
487 // all controls should be recreated 489 // all controls should be recreated
488 styled()->SetText(another_text); 490 styled()->SetText(another_text);
489 int updated_height = styled()->GetHeightForWidth(styled()->width()); 491 int updated_height = styled()->GetHeightForWidth(styled()->width());
490 EXPECT_NE(updated_height, real_height); 492 EXPECT_NE(updated_height, real_height);
491 View* first_child_after_text_update = styled()->has_children() ? 493 View* first_child_after_text_update = styled()->has_children() ?
492 styled()->child_at(0) : nullptr; 494 styled()->child_at(0) : nullptr;
493 EXPECT_NE(first_child_after_text_update, first_child_after_layout); 495 EXPECT_NE(first_child_after_text_update, first_child_after_layout);
494 } 496 }
495 497
496 } // namespace views 498 } // namespace views
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698