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

Side by Side Diff: ui/views/controls/button/blue_button_unittest.cc

Issue 681753004: Standardize usage of virtual/override/final specifiers. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 1 month 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
« no previous file with comments | « ui/views/controls/button/blue_button.h ('k') | ui/views/controls/button/button.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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(NULL, base::ASCIIToUTF16("foo")) {}
21 virtual ~TestBlueButton() {} 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;
(...skipping 18 matching lines...) Expand all
50 // Make sure it's still used after the native theme "changes". 50 // Make sure it's still used after the native theme "changes".
51 blue_button.OnNativeThemeChanged(NULL); 51 blue_button.OnNativeThemeChanged(NULL);
52 gfx::Canvas canvas2(blue_button.bounds().size(), 1.0, true); 52 gfx::Canvas canvas2(blue_button.bounds().size(), 1.0, true);
53 blue_button.border()->Paint(blue_button, &canvas2); 53 blue_button.border()->Paint(blue_button, &canvas2);
54 54
55 EXPECT_TRUE(gfx::BitmapsAreEqual(canvas.ExtractImageRep().sk_bitmap(), 55 EXPECT_TRUE(gfx::BitmapsAreEqual(canvas.ExtractImageRep().sk_bitmap(),
56 canvas2.ExtractImageRep().sk_bitmap())); 56 canvas2.ExtractImageRep().sk_bitmap()));
57 } 57 }
58 58
59 } // namespace views 59 } // namespace views
OLDNEW
« no previous file with comments | « ui/views/controls/button/blue_button.h ('k') | ui/views/controls/button/button.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698