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

Side by Side Diff: ash/shelf/shelf_tooltip_manager.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_SHELF_TOOLTIP_MANAGER_H_ 5 #ifndef ASH_SHELF_SHELF_TOOLTIP_MANAGER_H_
6 #define ASH_SHELF_SHELF_TOOLTIP_MANAGER_H_ 6 #define ASH_SHELF_SHELF_TOOLTIP_MANAGER_H_
7 7
8 #include "ash/ash_export.h" 8 #include "ash/ash_export.h"
9 #include "ash/shelf/shelf_layout_manager_observer.h" 9 #include "ash/shelf/shelf_layout_manager_observer.h"
10 #include "base/macros.h" 10 #include "base/macros.h"
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
57 void set_timer_delay_for_test(int timer_delay) { timer_delay_ = timer_delay; } 57 void set_timer_delay_for_test(int timer_delay) { timer_delay_ = timer_delay; }
58 58
59 protected: 59 protected:
60 // ui::EventHandler overrides: 60 // ui::EventHandler overrides:
61 void OnEvent(ui::Event* event) override; 61 void OnEvent(ui::Event* event) override;
62 62
63 // aura::WindowObserver overrides: 63 // aura::WindowObserver overrides:
64 void OnWindowDestroying(aura::Window* window) override; 64 void OnWindowDestroying(aura::Window* window) override;
65 65
66 // views::PointerWatcher overrides: 66 // views::PointerWatcher overrides:
67 void OnMousePressed(const ui::MouseEvent& event, 67 void OnMousePressed(const gfx::Point& location_in_screen,
68 const gfx::Point& location_in_screen) override; 68 views::Widget* target) override;
69 void OnTouchPressed(const ui::TouchEvent& event, 69 void OnTouchPressed(const gfx::Point& location_in_screen,
70 const gfx::Point& location_in_screen) override; 70 views::Widget* target) override;
71 71
72 // ShelfLayoutManagerObserver overrides: 72 // ShelfLayoutManagerObserver overrides:
73 void WillDeleteShelf() override; 73 void WillDeleteShelf() override;
74 void WillChangeVisibilityState(ShelfVisibilityState new_state) override; 74 void WillChangeVisibilityState(ShelfVisibilityState new_state) override;
75 void OnAutoHideStateChanged(ShelfAutoHideState new_state) override; 75 void OnAutoHideStateChanged(ShelfAutoHideState new_state) override;
76 76
77 private: 77 private:
78 class ShelfTooltipBubble; 78 class ShelfTooltipBubble;
79 friend class test::ShelfViewTest; 79 friend class test::ShelfViewTest;
80 friend class test::ShelfTooltipManagerTest; 80 friend class test::ShelfTooltipManagerTest;
81 81
82 int timer_delay_; 82 int timer_delay_;
83 base::OneShotTimer timer_; 83 base::OneShotTimer timer_;
84 84
85 ShelfView* shelf_view_; 85 ShelfView* shelf_view_;
86 aura::Window* root_window_; 86 aura::Window* root_window_;
87 ShelfLayoutManager* shelf_layout_manager_; 87 ShelfLayoutManager* shelf_layout_manager_;
88 views::BubbleDialogDelegateView* bubble_; 88 views::BubbleDialogDelegateView* bubble_;
89 89
90 base::WeakPtrFactory<ShelfTooltipManager> weak_factory_; 90 base::WeakPtrFactory<ShelfTooltipManager> weak_factory_;
91 91
92 DISALLOW_COPY_AND_ASSIGN(ShelfTooltipManager); 92 DISALLOW_COPY_AND_ASSIGN(ShelfTooltipManager);
93 }; 93 };
94 94
95 } // namespace ash 95 } // namespace ash
96 96
97 #endif // ASH_SHELF_SHELF_TOOLTIP_MANAGER_H_ 97 #endif // ASH_SHELF_SHELF_TOOLTIP_MANAGER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698