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

Side by Side Diff: ui/views/animation/test/ink_drop_host_view_test_api.cc

Issue 2070143003: Add MD ink drop ripple to app list button (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@b612539_shelf_button_ripple
Patch Set: Updated tests Created 4 years, 6 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 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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/animation/test/ink_drop_host_view_test_api.h" 5 #include "ui/views/animation/test/ink_drop_host_view_test_api.h"
6 6
7 namespace views { 7 namespace views {
8 namespace test { 8 namespace test {
9 9
10 InkDropHostViewTestApi::InkDropHostViewTestApi(InkDropHostView* host_view) 10 InkDropHostViewTestApi::InkDropHostViewTestApi(InkDropHostView* host_view)
11 : host_view_(host_view) {} 11 : host_view_(host_view) {}
12 12
13 InkDropHostViewTestApi::~InkDropHostViewTestApi() {} 13 InkDropHostViewTestApi::~InkDropHostViewTestApi() {}
14 14
15 void InkDropHostViewTestApi::SetInkDrop(std::unique_ptr<InkDrop> ink_drop) { 15 void InkDropHostViewTestApi::SetInkDrop(std::unique_ptr<InkDrop> ink_drop) {
16 host_view_->SetHasInkDrop(true); 16 if (!host_view_->ink_drop_)
bruthig 2016/06/22 19:07:29 This should never result in true, InkDropHostViews
17 host_view_->SetHasInkDrop(true);
17 host_view_->ink_drop_ = std::move(ink_drop); 18 host_view_->ink_drop_ = std::move(ink_drop);
18 } 19 }
19 20
20 } // namespace test 21 } // namespace test
21 } // namespace views 22 } // namespace views
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698