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

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

Issue 115113006: Rename Launcher to Shelf. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: more fixes Created 7 years 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.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 "ash/system/user/login_status.h" 8 #include "ash/system/user/login_status.h"
9 #include "base/base_export.h" 9 #include "base/base_export.h"
10 #include "base/memory/scoped_ptr.h" 10 #include "base/memory/scoped_ptr.h"
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
52 void DestroyItemViews(); 52 void DestroyItemViews();
53 void BubbleViewDestroyed(); 53 void BubbleViewDestroyed();
54 void StartAutoCloseTimer(int seconds); 54 void StartAutoCloseTimer(int seconds);
55 void StopAutoCloseTimer(); 55 void StopAutoCloseTimer();
56 void RestartAutoCloseTimer(); 56 void RestartAutoCloseTimer();
57 void Close(); 57 void Close();
58 void SetVisible(bool is_visible); 58 void SetVisible(bool is_visible);
59 bool IsVisible(); 59 bool IsVisible();
60 60
61 // Returns true if any of the SystemTrayItems return true from 61 // Returns true if any of the SystemTrayItems return true from
62 // ShouldShowLauncher(). 62 // ShouldShowShelf().
63 bool ShouldShowLauncher() const; 63 bool ShouldShowShelf() const;
64 64
65 private: 65 private:
66 void CreateItemViews(user::LoginStatus login_status); 66 void CreateItemViews(user::LoginStatus login_status);
67 67
68 ash::SystemTray* tray_; 68 ash::SystemTray* tray_;
69 views::TrayBubbleView* bubble_view_; 69 views::TrayBubbleView* bubble_view_;
70 std::vector<ash::SystemTrayItem*> items_; 70 std::vector<ash::SystemTrayItem*> items_;
71 BubbleType bubble_type_; 71 BubbleType bubble_type_;
72 72
73 int autoclose_delay_; 73 int autoclose_delay_;
74 base::OneShotTimer<SystemTrayBubble> autoclose_; 74 base::OneShotTimer<SystemTrayBubble> autoclose_;
75 75
76 DISALLOW_COPY_AND_ASSIGN(SystemTrayBubble); 76 DISALLOW_COPY_AND_ASSIGN(SystemTrayBubble);
77 }; 77 };
78 78
79 } // namespace internal 79 } // namespace internal
80 } // namespace ash 80 } // namespace ash
81 81
82 #endif // ASH_SYSTEM_TRAY_SYSTEM_TRAY_BUBBLE_H_ 82 #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