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

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

Issue 1242573005: Added the Material Design ink drop ripple effect to the navigation buttons in the browser toolbar. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Added comment as to why ripple was on ChromeOS only. Created 5 years, 5 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 ebc113aa0a921b747a36d97d4bf6af1458642712..27257239e6b686f1d126faad0e64795d998ca94d 100644
--- a/chrome/browser/ui/views/toolbar/toolbar_button.h
+++ b/chrome/browser/ui/views/toolbar/toolbar_button.h
@@ -5,6 +5,7 @@
#ifndef CHROME_BROWSER_UI_VIEWS_TOOLBAR_TOOLBAR_BUTTON_H_
#define CHROME_BROWSER_UI_VIEWS_TOOLBAR_TOOLBAR_BUTTON_H_
+#include "base/memory/scoped_ptr.h"
#include "ui/views/context_menu_controller.h"
#include "ui/views/controls/button/button.h"
#include "ui/views/controls/button/label_button.h"
@@ -14,6 +15,7 @@ class MenuModel;
}
namespace views {
+class InkDropAnimationController;
class MenuRunner;
}
@@ -81,6 +83,9 @@ class ToolbarButton : public views::LabelButton,
// Menu runner to display drop down menu.
scoped_ptr<views::MenuRunner> menu_runner_;
+ // Animation controller for the ink drop ripple effect.
+ scoped_ptr<views::InkDropAnimationController> ink_drop_animation_controller_;
+
// A factory for tasks that show the dropdown context menu for the button.
base::WeakPtrFactory<ToolbarButton> show_menu_factory_;
« no previous file with comments | « no previous file | chrome/browser/ui/views/toolbar/toolbar_button.cc » ('j') | chrome/browser/ui/views/toolbar/toolbar_button.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698