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

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

Issue 9817026: Changes how we detect whether the launcher should be shown when (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix comment 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/launcher/launcher.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/launcher/background_animator.h" 9 #include "ash/launcher/background_animator.h"
10 #include "ash/ash_export.h" 10 #include "ash/ash_export.h"
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
55 55
56 // Shows details of a particular item. If |close_delay_in_seconds| is 56 // Shows details of a particular item. If |close_delay_in_seconds| is
57 // non-zero, then the view is automatically closed after the specified time. 57 // non-zero, then the view is automatically closed after the specified time.
58 void ShowDetailedView(SystemTrayItem* item, 58 void ShowDetailedView(SystemTrayItem* item,
59 int close_delay_in_seconds, 59 int close_delay_in_seconds,
60 bool activate); 60 bool activate);
61 61
62 // Updates the items when the login status of the system changes. 62 // Updates the items when the login status of the system changes.
63 void UpdateAfterLoginStatusChange(user::LoginStatus login_status); 63 void UpdateAfterLoginStatusChange(user::LoginStatus login_status);
64 64
65 // Returns true if a bubble is currently showing.
66 bool showing_bubble() const { return bubble_ != NULL; }
67
65 const ScopedVector<SystemTrayItem>& items() const { return items_; } 68 const ScopedVector<SystemTrayItem>& items() const { return items_; }
66 69
67 // Sets whether the tray paints a background. Default is true, but is set to 70 // Sets whether the tray paints a background. Default is true, but is set to
68 // false if a window overlaps the shelf. 71 // false if a window overlaps the shelf.
69 void SetPaintsBackground( 72 void SetPaintsBackground(
70 bool value, 73 bool value,
71 internal::BackgroundAnimator::ChangeType change_type); 74 internal::BackgroundAnimator::ChangeType change_type);
72 75
73 AccessibilityObserver* accessibility_observer() const { 76 AccessibilityObserver* accessibility_observer() const {
74 return accessibility_observer_; 77 return accessibility_observer_;
(...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after
154 internal::SystemTrayBackground* background_; 157 internal::SystemTrayBackground* background_;
155 158
156 internal::BackgroundAnimator background_animator_; 159 internal::BackgroundAnimator background_animator_;
157 160
158 DISALLOW_COPY_AND_ASSIGN(SystemTray); 161 DISALLOW_COPY_AND_ASSIGN(SystemTray);
159 }; 162 };
160 163
161 } // namespace ash 164 } // namespace ash
162 165
163 #endif // ASH_SYSTEM_TRAY_SYSTEM_TRAY_H_ 166 #endif // ASH_SYSTEM_TRAY_SYSTEM_TRAY_H_
OLDNEW
« no previous file with comments | « ash/launcher/launcher.cc ('k') | ash/system/tray/system_tray.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698