summaryrefslogtreecommitdiffstats
path: root/ui/views/view_unittest.cc
diff options
context:
space:
mode:
authordanakj <danakj@chromium.org>2015-03-25 12:49:38 -0700
committerCommit bot <commit-bot@chromium.org>2015-03-25 19:50:05 +0000
commit9d993b98ede4cfd3e33bf626dbbf7c055ff73254 (patch)
tree27e6fcc33cade5f98a05a4649f1f481104ef883d /ui/views/view_unittest.cc
parent7baac01caadfba109df19ccf751230d48ef7b29d (diff)
downloadchromium_src-9d993b98ede4cfd3e33bf626dbbf7c055ff73254.zip
chromium_src-9d993b98ede4cfd3e33bf626dbbf7c055ff73254.tar.gz
chromium_src-9d993b98ede4cfd3e33bf626dbbf7c055ff73254.tar.bz2
views: Make View::Paint non-virtual.
We can then merge Paint and PaintCommon. Subclasses should use OnPaint to override display behaviour. R=sky BUG=466426 Review URL: https://codereview.chromium.org/1029943002 Cr-Commit-Position: refs/heads/master@{#322214}
Diffstat (limited to 'ui/views/view_unittest.cc')
-rw-r--r--ui/views/view_unittest.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/ui/views/view_unittest.cc b/ui/views/view_unittest.cc
index 707d9f2..cd6b30f 100644
--- a/ui/views/view_unittest.cc
+++ b/ui/views/view_unittest.cc
@@ -240,7 +240,7 @@ class TestView : public View {
void OnMouseEntered(const ui::MouseEvent& event) override;
void OnMouseExited(const ui::MouseEvent& event) override;
- void Paint(gfx::Canvas* canvas, const CullSet& cull_set) override;
+ void OnPaint(gfx::Canvas* canvas) override;
void SchedulePaintInRect(const gfx::Rect& rect) override;
bool AcceleratorPressed(const ui::Accelerator& accelerator) override;
@@ -423,7 +423,7 @@ TEST_F(ViewTest, DeleteOnPressed) {
// Painting
////////////////////////////////////////////////////////////////////////////////
-void TestView::Paint(gfx::Canvas* canvas, const CullSet& cull_set) {
+void TestView::OnPaint(gfx::Canvas* canvas) {
canvas->sk_canvas()->getClipBounds(&last_clip_);
}