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

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

Issue 20598004: Do not hide the web notification popups by the system tray, rather let them avoid (2nd) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix Created 7 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/status_area_widget.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 7
8 #include "ash/ash_export.h" 8 #include "ash/ash_export.h"
9 #include "ash/system/tray/system_tray_bubble.h" 9 #include "ash/system/tray/system_tray_bubble.h"
10 #include "ash/system/tray/tray_background_view.h" 10 #include "ash/system/tray/tray_background_view.h"
(...skipping 173 matching lines...) Expand 10 before | Expand all | Expand 10 after
184 void ShowItems(const std::vector<SystemTrayItem*>& items, 184 void ShowItems(const std::vector<SystemTrayItem*>& items,
185 bool details, 185 bool details,
186 bool activate, 186 bool activate,
187 BubbleCreationType creation_type, 187 BubbleCreationType creation_type,
188 int x_offset); 188 int x_offset);
189 189
190 // Constructs or re-constructs |notification_bubble_| and populates it with 190 // Constructs or re-constructs |notification_bubble_| and populates it with
191 // |notification_items_|, or destroys it if there are no notification items. 191 // |notification_items_|, or destroys it if there are no notification items.
192 void UpdateNotificationBubble(); 192 void UpdateNotificationBubble();
193 193
194 // Checks the current status of the system tray and updates the web
195 // notification tray according to the current status.
196 void UpdateWebNotifications();
197
194 const ScopedVector<SystemTrayItem>& items() const { return items_; } 198 const ScopedVector<SystemTrayItem>& items() const { return items_; }
195 199
196 // Overridden from internal::ActionableView. 200 // Overridden from internal::ActionableView.
197 virtual bool PerformAction(const ui::Event& event) OVERRIDE; 201 virtual bool PerformAction(const ui::Event& event) OVERRIDE;
198 202
199 // Owned items. 203 // Owned items.
200 ScopedVector<SystemTrayItem> items_; 204 ScopedVector<SystemTrayItem> items_;
201 205
202 // Pointers to members of |items_|. 206 // Pointers to members of |items_|.
203 SystemTrayItem* detailed_item_; 207 SystemTrayItem* detailed_item_;
(...skipping 22 matching lines...) Expand all
226 bool full_system_tray_menu_; 230 bool full_system_tray_menu_;
227 231
228 internal::TrayAccessibility* tray_accessibility_; // not owned 232 internal::TrayAccessibility* tray_accessibility_; // not owned
229 233
230 DISALLOW_COPY_AND_ASSIGN(SystemTray); 234 DISALLOW_COPY_AND_ASSIGN(SystemTray);
231 }; 235 };
232 236
233 } // namespace ash 237 } // namespace ash
234 238
235 #endif // ASH_SYSTEM_TRAY_SYSTEM_TRAY_H_ 239 #endif // ASH_SYSTEM_TRAY_SYSTEM_TRAY_H_
OLDNEW
« no previous file with comments | « ash/system/status_area_widget.cc ('k') | ash/system/tray/system_tray.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698