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

Side by Side Diff: ash/system/tray/system_tray_bubble.h

Issue 2948223002: Revert of Do not activate TrayBubbleView by default (Closed)
Patch Set: Created 3 years, 6 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
« no previous file with comments | « ash/system/tray/system_tray.cc ('k') | ash/system/tray/system_tray_bubble.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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_SYSTEM_TRAY_SYSTEM_TRAY_BUBBLE_H_ 5 #ifndef ASH_SYSTEM_TRAY_SYSTEM_TRAY_BUBBLE_H_
6 #define ASH_SYSTEM_TRAY_SYSTEM_TRAY_BUBBLE_H_ 6 #define ASH_SYSTEM_TRAY_SYSTEM_TRAY_BUBBLE_H_
7 7
8 #include <map> 8 #include <map>
9 #include <memory> 9 #include <memory>
10 #include <vector> 10 #include <vector>
(...skipping 20 matching lines...) Expand all
31 // Change the items displayed in the bubble. 31 // Change the items displayed in the bubble.
32 void UpdateView(const std::vector<ash::SystemTrayItem*>& items, 32 void UpdateView(const std::vector<ash::SystemTrayItem*>& items,
33 BubbleType bubble_type); 33 BubbleType bubble_type);
34 34
35 // Creates |bubble_view_| and a child views for each member of |items_|. 35 // Creates |bubble_view_| and a child views for each member of |items_|.
36 // Also creates |bubble_wrapper_|. |init_params| may be modified. 36 // Also creates |bubble_wrapper_|. |init_params| may be modified.
37 void InitView(views::View* anchor, 37 void InitView(views::View* anchor,
38 LoginStatus login_status, 38 LoginStatus login_status,
39 views::TrayBubbleView::InitParams* init_params); 39 views::TrayBubbleView::InitParams* init_params);
40 40
41 // Focus the default item if no item is focused. Othewise, do nothing.
42 void FocusDefaultIfNeeded();
43
41 BubbleType bubble_type() const { return bubble_type_; } 44 BubbleType bubble_type() const { return bubble_type_; }
42 views::TrayBubbleView* bubble_view() const { return bubble_view_; } 45 views::TrayBubbleView* bubble_view() const { return bubble_view_; }
43 46
44 void DestroyItemViews(); 47 void DestroyItemViews();
45 void BubbleViewDestroyed(); 48 void BubbleViewDestroyed();
46 void StartAutoCloseTimer(int seconds); 49 void StartAutoCloseTimer(int seconds);
47 void StopAutoCloseTimer(); 50 void StopAutoCloseTimer();
48 void RestartAutoCloseTimer(); 51 void RestartAutoCloseTimer();
49 void Close(); 52 void Close();
50 void SetVisible(bool is_visible); 53 void SetVisible(bool is_visible);
(...skipping 23 matching lines...) Expand all
74 77
75 int autoclose_delay_; 78 int autoclose_delay_;
76 base::OneShotTimer autoclose_; 79 base::OneShotTimer autoclose_;
77 80
78 DISALLOW_COPY_AND_ASSIGN(SystemTrayBubble); 81 DISALLOW_COPY_AND_ASSIGN(SystemTrayBubble);
79 }; 82 };
80 83
81 } // namespace ash 84 } // namespace ash
82 85
83 #endif // ASH_SYSTEM_TRAY_SYSTEM_TRAY_BUBBLE_H_ 86 #endif // ASH_SYSTEM_TRAY_SYSTEM_TRAY_BUBBLE_H_
OLDNEW
« no previous file with comments | « ash/system/tray/system_tray.cc ('k') | ash/system/tray/system_tray_bubble.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698