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

Unified Diff: chrome/browser/ui/views/toolbar/toolbar_button.h

Issue 1390113006: Added material design mouse hover feedback support. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 2 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: chrome/browser/ui/views/toolbar/toolbar_button.h
diff --git a/chrome/browser/ui/views/toolbar/toolbar_button.h b/chrome/browser/ui/views/toolbar/toolbar_button.h
index f607a446475015b860253cf05b3bb0866b107a9d..4b95b8400d11ec1d9b480251bfa005398cbb0931 100644
--- a/chrome/browser/ui/views/toolbar/toolbar_button.h
+++ b/chrome/browser/ui/views/toolbar/toolbar_button.h
@@ -48,10 +48,12 @@ class ToolbarButton : public views::LabelButton,
void OnMouseReleased(const ui::MouseEvent& event) override;
// Showing the drop down results in a MouseCaptureLost, we need to ignore it.
void OnMouseCaptureLost() override;
+ void OnMouseEntered(const ui::MouseEvent& event) override;
void OnMouseExited(const ui::MouseEvent& event) override;
void OnGestureEvent(ui::GestureEvent* event) override;
void GetAccessibleState(ui::AXViewState* state) override;
scoped_ptr<views::LabelButtonBorder> CreateDefaultBorder() const override;
+ void OnEnabledChanged() override;
// views::ContextMenuController:
void ShowContextMenuForView(View* source,
@@ -81,6 +83,9 @@ class ToolbarButton : public views::LabelButton,
}
private:
+ // Updates the |ink_drop_animation_controller_|'s hover state.
+ void UpdateInkDropHoverState();
+
// views::LabelButton:
const char* GetClassName() const override;
« no previous file with comments | « no previous file | chrome/browser/ui/views/toolbar/toolbar_button.cc » ('j') | ui/views/animation/ink_drop_hover.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698