Chromium Code Reviews| Index: ash/shelf/shelf_view_unittest.cc |
| diff --git a/ash/shelf/shelf_view_unittest.cc b/ash/shelf/shelf_view_unittest.cc |
| index a2e7b1d3427543957b8f1f4da7ba904be8e898fa..9682e8eab8da7e81d1ea8da3fbe7de0f77618b5e 100644 |
| --- a/ash/shelf/shelf_view_unittest.cc |
| +++ b/ash/shelf/shelf_view_unittest.cc |
| @@ -1886,6 +1886,18 @@ class InkDropSpy : public views::InkDrop { |
| ink_drop_->SetFocused(is_focused); |
| } |
| + bool IsHighlightFadingInOrVisible() const override { |
| + return ink_drop_->IsHighlightFadingInOrVisible(); |
| + } |
| + |
| + // TODO(spqchan): Setting this for ink_drop_ causes the ink drop tests to |
|
bruthig
2017/05/01 22:42:18
Which tests fail? I tried running ash_unittests,
spqchan
2017/05/02 22:50:05
Oh hey, looks like this fixed it: https://chromium
|
| + // fail. This requires more investigation. |
| + void SetShowHighlightOnHover(bool show_highlight_on_hover) override {} |
| + |
| + void SetShowHighlightOnFocus(bool show_highlight_on_focus) override { |
| + ink_drop_->SetShowHighlightOnFocus(show_highlight_on_focus); |
| + } |
| + |
| std::unique_ptr<views::InkDrop> ink_drop_; |
| std::vector<views::InkDropState> requested_states_; |