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

Unified Diff: ash/shelf/overflow_bubble.h

Issue 23540013: [ash] Wrong LauncherItem state when overflow bubble is shown (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 7 years, 3 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
« no previous file with comments | « no previous file | ash/shelf/overflow_bubble.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/shelf/overflow_bubble.h
diff --git a/ash/shelf/overflow_bubble.h b/ash/shelf/overflow_bubble.h
index cb0d5bac4843b1bb4e7958cadbfa33fb61f3fa77..03b0abd3d70189d13c7d1e06a73823046fb7a588 100644
--- a/ash/shelf/overflow_bubble.h
+++ b/ash/shelf/overflow_bubble.h
@@ -7,6 +7,7 @@
#include "base/basictypes.h"
#include "base/compiler_specific.h"
+#include "ui/base/events/event_handler.h"
#include "ui/views/widget/widget_observer.h"
namespace views {
@@ -23,7 +24,8 @@ namespace internal {
class LauncherView;
// OverflowBubble displays the overflown launcher items in a bubble.
-class OverflowBubble : public views::WidgetObserver {
+class OverflowBubble : public ui::EventHandler,
+ public views::WidgetObserver {
public:
OverflowBubble();
virtual ~OverflowBubble();
@@ -37,10 +39,15 @@ class OverflowBubble : public views::WidgetObserver {
LauncherView* launcher_view() { return launcher_view_; }
private:
+ // Overridden from ui::EventHandler:
+ virtual void OnMouseEvent(ui::MouseEvent* event) OVERRIDE;
+ virtual void OnTouchEvent(ui::TouchEvent* event) OVERRIDE;
+
// Overridden from views::WidgetObserver:
virtual void OnWidgetDestroying(views::Widget* widget) OVERRIDE;
views::View* bubble_; // Owned by views hierarchy.
+ views::View* anchor_; // Owned by LauncherView.
LauncherView* launcher_view_; // Owned by |bubble_|.
DISALLOW_COPY_AND_ASSIGN(OverflowBubble);
« no previous file with comments | « no previous file | ash/shelf/overflow_bubble.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698