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

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

Issue 10825264: Consolidate volume control code. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 4 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/tray/system_tray_delegate.h ('k') | ash/system/tray/system_tray_item.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_ITEM_H_ 5 #ifndef ASH_SYSTEM_TRAY_SYSTEM_TRAY_ITEM_H_
6 #define ASH_SYSTEM_TRAY_SYSTEM_TRAY_ITEM_H_ 6 #define ASH_SYSTEM_TRAY_SYSTEM_TRAY_ITEM_H_
7 7
8 #include "ash/ash_export.h" 8 #include "ash/ash_export.h"
9 #include "ash/system/user/login_status.h" 9 #include "ash/system/user/login_status.h"
10 #include "ash/wm/shelf_types.h" 10 #include "ash/wm/shelf_types.h"
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
60 // Updates the tray view (if applicable) when the user's login status changes. 60 // Updates the tray view (if applicable) when the user's login status changes.
61 // It is not necessary the update the default or detailed view, since the 61 // It is not necessary the update the default or detailed view, since the
62 // default/detailed popup is closed when login status changes. The default 62 // default/detailed popup is closed when login status changes. The default
63 // implementation does nothing. 63 // implementation does nothing.
64 virtual void UpdateAfterLoginStatusChange(user::LoginStatus status); 64 virtual void UpdateAfterLoginStatusChange(user::LoginStatus status);
65 65
66 // Updates the tray view (if applicable) when shelf's alignment changes. 66 // Updates the tray view (if applicable) when shelf's alignment changes.
67 // The default implementation does nothing. 67 // The default implementation does nothing.
68 virtual void UpdateAfterShelfAlignmentChange(ShelfAlignment alignment); 68 virtual void UpdateAfterShelfAlignmentChange(ShelfAlignment alignment);
69 69
70 // Updates the tray view after the ash shell has been initialized.
71 virtual void UpdateAfterAshInit();
sadrul 2012/08/09 18:05:33 I don't think we should have this. Or if we do hav
jennyz 2012/08/13 23:26:17 yes, I think your suggestion is reasonable. Now I
72
70 // Shows the detailed view for this item. If the main popup for the tray is 73 // Shows the detailed view for this item. If the main popup for the tray is
71 // currently visible, then making this call would use the existing window to 74 // currently visible, then making this call would use the existing window to
72 // display the detailed item. The detailed item will inherit the bounds of the 75 // display the detailed item. The detailed item will inherit the bounds of the
73 // existing window. 76 // existing window.
74 // If there is no existing view, then this is equivalent to calling 77 // If there is no existing view, then this is equivalent to calling
75 // PopupDetailedView(0, true). 78 // PopupDetailedView(0, true).
76 void TransitionDetailedView(); 79 void TransitionDetailedView();
77 80
78 // Pops up the detailed view for this item. An item can request to show its 81 // Pops up the detailed view for this item. An item can request to show its
79 // detailed view using this function (e.g. from an observer callback when 82 // detailed view using this function (e.g. from an observer callback when
(...skipping 17 matching lines...) Expand all
97 void HideNotificationView(); 100 void HideNotificationView();
98 101
99 private: 102 private:
100 103
101 DISALLOW_COPY_AND_ASSIGN(SystemTrayItem); 104 DISALLOW_COPY_AND_ASSIGN(SystemTrayItem);
102 }; 105 };
103 106
104 } // namespace ash 107 } // namespace ash
105 108
106 #endif // ASH_SYSTEM_TRAY_SYSTEM_TRAY_ITEM_H_ 109 #endif // ASH_SYSTEM_TRAY_SYSTEM_TRAY_ITEM_H_
OLDNEW
« no previous file with comments | « ash/system/tray/system_tray_delegate.h ('k') | ash/system/tray/system_tray_item.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698