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

Unified Diff: ash/shelf/shelf_view_unittest.cc

Issue 2720183002: [Views] Update ink drop for omnibox icons (Closed)
Patch Set: Fixed tests and added comments Created 3 years, 8 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 side-by-side diff with in-line comments
Download patch
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_;

Powered by Google App Engine
This is Rietveld 408576698