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

Unified Diff: chrome/browser/ui/views/bar_control_button.h

Issue 1478303003: Converted all Views to use an InkDropDelegate instead of a InkDropAnimationController. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed compile errors Created 5 years, 1 month 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/bar_control_button.h
diff --git a/chrome/browser/ui/views/bar_control_button.h b/chrome/browser/ui/views/bar_control_button.h
index 8bc3917b3e9ad03e8a1c7c0b465e482a4450543a..298cc382f0ba563eecac5306e3f6705789253537 100644
--- a/chrome/browser/ui/views/bar_control_button.h
+++ b/chrome/browser/ui/views/bar_control_button.h
@@ -14,10 +14,6 @@ namespace gfx {
enum class VectorIconId;
}
-namespace views {
-class InkDropAnimationController;
-}
-
// A class for buttons that control bars (find bar, download shelf, etc.). The
// button has an image and no text.
class BarControlButton : public views::ImageButton, public views::InkDropHost {
@@ -33,11 +29,8 @@ class BarControlButton : public views::ImageButton, public views::InkDropHost {
// views::ImageButton:
void OnThemeChanged() override;
void OnNativeThemeChanged(const ui::NativeTheme* theme) override;
- void Layout() override;
bool OnMousePressed(const ui::MouseEvent& event) override;
- void OnGestureEvent(ui::GestureEvent* event) override;
void OnMouseReleased(const ui::MouseEvent& event) override;
- void NotifyClick(const ui::Event& event) override;
private:
// views::InkDropHost:
@@ -48,9 +41,6 @@ class BarControlButton : public views::ImageButton, public views::InkDropHost {
gfx::VectorIconId id_;
base::Callback<SkColor(void)> get_text_color_callback_;
- // Animation controller for the ink drop ripple effect.
- scoped_ptr<views::InkDropAnimationController> ink_drop_animation_controller_;
-
DISALLOW_COPY_AND_ASSIGN(BarControlButton);
};
« no previous file with comments | « no previous file | chrome/browser/ui/views/bar_control_button.cc » ('j') | chrome/browser/ui/views/bar_control_button.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698