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

Side by Side Diff: ash/shelf/overflow_bubble.h

Issue 1957653003: mash: Don't close system tray bubble for clicks in menus/notifications (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: . Created 4 years, 7 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 unified diff | Download patch
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef ASH_SHELF_OVERFLOW_BUBBLE_H_ 5 #ifndef ASH_SHELF_OVERFLOW_BUBBLE_H_
6 #define ASH_SHELF_OVERFLOW_BUBBLE_H_ 6 #define ASH_SHELF_OVERFLOW_BUBBLE_H_
7 7
8 #include "base/macros.h" 8 #include "base/macros.h"
9 #include "ui/views/pointer_watcher.h" 9 #include "ui/views/pointer_watcher.h"
10 #include "ui/views/widget/widget_observer.h" 10 #include "ui/views/widget/widget_observer.h"
(...skipping 28 matching lines...) Expand all
39 void HideBubbleAndRefreshButton(); 39 void HideBubbleAndRefreshButton();
40 40
41 bool IsShowing() const { return !!bubble_; } 41 bool IsShowing() const { return !!bubble_; }
42 ShelfView* shelf_view() { return shelf_view_; } 42 ShelfView* shelf_view() { return shelf_view_; }
43 OverflowBubbleView* bubble_view() { return bubble_; } 43 OverflowBubbleView* bubble_view() { return bubble_; }
44 44
45 private: 45 private:
46 void ProcessPressedEvent(const gfx::Point& event_location_in_screen); 46 void ProcessPressedEvent(const gfx::Point& event_location_in_screen);
47 47
48 // views::PointerWatcher: 48 // views::PointerWatcher:
49 void OnMousePressed(const ui::MouseEvent& event, 49 void OnMousePressed(const gfx::Point& location_in_screen,
50 const gfx::Point& location_in_screen) override; 50 views::Widget* target) override;
51 void OnTouchPressed(const ui::TouchEvent& event, 51 void OnTouchPressed(const gfx::Point& location_in_screen,
52 const gfx::Point& location_in_screen) override; 52 views::Widget* target) override;
53 53
54 // Overridden from views::WidgetObserver: 54 // Overridden from views::WidgetObserver:
55 void OnWidgetDestroying(views::Widget* widget) override; 55 void OnWidgetDestroying(views::Widget* widget) override;
56 56
57 OverflowBubbleView* bubble_; // Owned by views hierarchy. 57 OverflowBubbleView* bubble_; // Owned by views hierarchy.
58 views::View* anchor_; // Owned by ShelfView. 58 views::View* anchor_; // Owned by ShelfView.
59 ShelfView* shelf_view_; // Owned by |bubble_|. 59 ShelfView* shelf_view_; // Owned by |bubble_|.
60 60
61 DISALLOW_COPY_AND_ASSIGN(OverflowBubble); 61 DISALLOW_COPY_AND_ASSIGN(OverflowBubble);
62 }; 62 };
63 63
64 } // namespace ash 64 } // namespace ash
65 65
66 #endif // ASH_SHELF_OVERFLOW_BUBBLE_H_ 66 #endif // ASH_SHELF_OVERFLOW_BUBBLE_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698