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

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

Issue 9704029: Reland r126700: ash uber tray: Add the detailed network popup (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 8 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « ash/system/network/tray_network.cc ('k') | ash/system/tray/system_tray.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_H_ 5 #ifndef ASH_SYSTEM_TRAY_SYSTEM_TRAY_H_
6 #define ASH_SYSTEM_TRAY_SYSTEM_TRAY_H_ 6 #define ASH_SYSTEM_TRAY_SYSTEM_TRAY_H_
7 #pragma once 7 #pragma once
8 8
9 #include "ash/ash_export.h" 9 #include "ash/ash_export.h"
10 #include "ash/system/user/login_status.h" 10 #include "ash/system/user/login_status.h"
(...skipping 16 matching lines...) Expand all
27 public: 27 public:
28 SystemTray(); 28 SystemTray();
29 virtual ~SystemTray(); 29 virtual ~SystemTray();
30 30
31 // Adds a new item in the tray. 31 // Adds a new item in the tray.
32 void AddTrayItem(SystemTrayItem* item); 32 void AddTrayItem(SystemTrayItem* item);
33 33
34 // Removes an existing tray item. 34 // Removes an existing tray item.
35 void RemoveTrayItem(SystemTrayItem* item); 35 void RemoveTrayItem(SystemTrayItem* item);
36 36
37 // Shows the default view of all items.
38 void ShowDefaultView();
39
37 // Shows details of a particular item. If |close_delay_in_seconds| is 40 // Shows details of a particular item. If |close_delay_in_seconds| is
38 // non-zero, then the view is automatically closed after the specified time. 41 // non-zero, then the view is automatically closed after the specified time.
39 void ShowDetailedView(SystemTrayItem* item, 42 void ShowDetailedView(SystemTrayItem* item,
40 int close_delay_in_seconds, 43 int close_delay_in_seconds,
41 bool activate); 44 bool activate);
42 45
43 // Updates the items when the login status of the system changes. 46 // Updates the items when the login status of the system changes.
44 void UpdateAfterLoginStatusChange(user::LoginStatus login_status); 47 void UpdateAfterLoginStatusChange(user::LoginStatus login_status);
45 48
46 const std::vector<SystemTrayItem*>& items() const { return items_; } 49 const std::vector<SystemTrayItem*>& items() const { return items_; }
(...skipping 20 matching lines...) Expand all
67 // The popup widget and the delegate. 70 // The popup widget and the delegate.
68 internal::SystemTrayBubble* bubble_; 71 internal::SystemTrayBubble* bubble_;
69 views::Widget* popup_; 72 views::Widget* popup_;
70 73
71 DISALLOW_COPY_AND_ASSIGN(SystemTray); 74 DISALLOW_COPY_AND_ASSIGN(SystemTray);
72 }; 75 };
73 76
74 } // namespace ash 77 } // namespace ash
75 78
76 #endif // ASH_SYSTEM_TRAY_SYSTEM_TRAY_H_ 79 #endif // ASH_SYSTEM_TRAY_SYSTEM_TRAY_H_
OLDNEW
« no previous file with comments | « ash/system/network/tray_network.cc ('k') | ash/system/tray/system_tray.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698