| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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/button/blue_button.h" | 5 #include "ui/views/controls/button/blue_button.h" |
| 6 | 6 |
| 7 #include "base/strings/string16.h" | 7 #include "base/strings/string16.h" |
| 8 #include "base/strings/utf_string_conversions.h" | 8 #include "base/strings/utf_string_conversions.h" |
| 9 #include "ui/gfx/canvas.h" | 9 #include "ui/gfx/canvas.h" |
| 10 #include "ui/gfx/skia_util.h" | 10 #include "ui/gfx/skia_util.h" |
| 11 #include "ui/views/controls/button/label_button_border.h" | 11 #include "ui/views/controls/button/label_button_border.h" |
| 12 #include "ui/views/test/views_test_base.h" | 12 #include "ui/views/test/views_test_base.h" |
| 13 | 13 |
| 14 namespace views { | 14 namespace views { |
| 15 | 15 |
| 16 namespace { | 16 namespace { |
| 17 | 17 |
| 18 class TestBlueButton : public BlueButton { | 18 class TestBlueButton : public BlueButton { |
| 19 public: | 19 public: |
| 20 TestBlueButton() : BlueButton(NULL, base::ASCIIToUTF16("foo")) {} | 20 TestBlueButton() : BlueButton(nullptr) { Init(base::ASCIIToUTF16("foo")); } |
| 21 ~TestBlueButton() override {} | 21 ~TestBlueButton() override {} |
| 22 | 22 |
| 23 using BlueButton::OnNativeThemeChanged; | 23 using BlueButton::OnNativeThemeChanged; |
| 24 | 24 |
| 25 private: | 25 private: |
| 26 DISALLOW_COPY_AND_ASSIGN(TestBlueButton); | 26 DISALLOW_COPY_AND_ASSIGN(TestBlueButton); |
| 27 }; | 27 }; |
| 28 | 28 |
| 29 } // namespace | 29 } // namespace |
| 30 | 30 |
| 31 typedef ViewsTestBase BlueButtonTest; | 31 typedef ViewsTestBase BlueButtonTest; |
| 32 | 32 |
| 33 TEST_F(BlueButtonTest, Border) { | 33 TEST_F(BlueButtonTest, Border) { |
| 34 // Compared to a normal LabelButton... | 34 // Compared to a normal LabelButton... |
| 35 LabelButton button(NULL, base::ASCIIToUTF16("foo")); | 35 LabelButton button(nullptr); |
| 36 button.Init(base::ASCIIToUTF16("foo")); |
| 36 button.SetBoundsRect(gfx::Rect(gfx::Point(0, 0), button.GetPreferredSize())); | 37 button.SetBoundsRect(gfx::Rect(gfx::Point(0, 0), button.GetPreferredSize())); |
| 37 gfx::Canvas button_canvas(button.bounds().size(), 1.0, true); | 38 gfx::Canvas button_canvas(button.bounds().size(), 1.0, true); |
| 38 button.border()->Paint(button, &button_canvas); | 39 button.border()->Paint(button, &button_canvas); |
| 39 | 40 |
| 40 // ... a special blue border should be used. | 41 // ... a special blue border should be used. |
| 41 TestBlueButton blue_button; | 42 TestBlueButton blue_button; |
| 42 blue_button.SetBoundsRect(gfx::Rect(gfx::Point(0, 0), | 43 blue_button.SetBoundsRect(gfx::Rect(gfx::Point(0, 0), |
| 43 blue_button.GetPreferredSize())); | 44 blue_button.GetPreferredSize())); |
| 44 gfx::Canvas canvas(blue_button.bounds().size(), 1.0, true); | 45 gfx::Canvas canvas(blue_button.bounds().size(), 1.0, true); |
| 45 blue_button.border()->Paint(blue_button, &canvas); | 46 blue_button.border()->Paint(blue_button, &canvas); |
| 46 EXPECT_EQ(button.GetText(), blue_button.GetText()); | 47 EXPECT_EQ(button.GetText(), blue_button.GetText()); |
| 47 EXPECT_FALSE(gfx::BitmapsAreEqual(button_canvas.ExtractImageRep().sk_bitmap(), | 48 EXPECT_FALSE(gfx::BitmapsAreEqual(button_canvas.ExtractImageRep().sk_bitmap(), |
| 48 canvas.ExtractImageRep().sk_bitmap())); | 49 canvas.ExtractImageRep().sk_bitmap())); |
| 49 | 50 |
| 50 // Make sure it's still used after the native theme "changes". | 51 // Make sure it's still used after the native theme "changes". |
| 51 blue_button.OnNativeThemeChanged(NULL); | 52 blue_button.OnNativeThemeChanged(NULL); |
| 52 gfx::Canvas canvas2(blue_button.bounds().size(), 1.0, true); | 53 gfx::Canvas canvas2(blue_button.bounds().size(), 1.0, true); |
| 53 blue_button.border()->Paint(blue_button, &canvas2); | 54 blue_button.border()->Paint(blue_button, &canvas2); |
| 54 | 55 |
| 55 EXPECT_TRUE(gfx::BitmapsAreEqual(canvas.ExtractImageRep().sk_bitmap(), | 56 EXPECT_TRUE(gfx::BitmapsAreEqual(canvas.ExtractImageRep().sk_bitmap(), |
| 56 canvas2.ExtractImageRep().sk_bitmap())); | 57 canvas2.ExtractImageRep().sk_bitmap())); |
| 57 } | 58 } |
| 58 | 59 |
| 59 } // namespace views | 60 } // namespace views |
| OLD | NEW |