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

Unified Diff: ash/shelf/app_list_button.h

Issue 1816753002: Enable mash shelf tooltips. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Revise tooltip event testing. Created 4 years, 9 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/app_list_button.h
diff --git a/ash/shelf/app_list_button.h b/ash/shelf/app_list_button.h
index e0e5cd8391521bc50f9629eb248716810b1fb506..52fafe6b8e4ef0f559a6201ff710492366cefce9 100644
--- a/ash/shelf/app_list_button.h
+++ b/ash/shelf/app_list_button.h
@@ -9,23 +9,15 @@
#include "ui/views/controls/button/image_button.h"
namespace ash {
-class ShelfButtonHost;
-class ShelfWidget;
+class ShelfView;
// Button used for the AppList icon on the shelf.
class AppListButton : public views::ImageButton {
public:
- // Bounds size (inset) required for the app icon image (in pixels).
- static const int kImageBoundsSize;
-
- AppListButton(views::ButtonListener* listener,
- ShelfButtonHost* host,
- ShelfWidget* shelf_widget);
+ explicit AppListButton(ShelfView* shelf_view);
~AppListButton() override;
- bool draw_background_as_active() {
- return draw_background_as_active_;
- }
+ bool draw_background_as_active() { return draw_background_as_active_; }
protected:
// views::ImageButton overrides:
@@ -33,9 +25,6 @@ class AppListButton : public views::ImageButton {
void OnMouseReleased(const ui::MouseEvent& event) override;
void OnMouseCaptureLost() override;
bool OnMouseDragged(const ui::MouseEvent& event) override;
- void OnMouseMoved(const ui::MouseEvent& event) override;
- void OnMouseEntered(const ui::MouseEvent& event) override;
- void OnMouseExited(const ui::MouseEvent& event) override;
void OnPaint(gfx::Canvas* canvas) override;
void GetAccessibleState(ui::AXViewState* state) override;
@@ -50,10 +39,7 @@ class AppListButton : public views::ImageButton {
// the application list.
bool draw_background_as_active_;
- ShelfButtonHost* host_;
- // Reference to the shelf widget containing this button, owned by the
- // root window controller.
- ShelfWidget* shelf_widget_;
+ ShelfView* shelf_view_;
DISALLOW_COPY_AND_ASSIGN(AppListButton);
};

Powered by Google App Engine
This is Rietveld 408576698