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

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

Issue 224113005: Eliminate ash::internal namespace (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 8 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.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"
11 #include "base/timer/timer.h" 11 #include "base/timer/timer.h"
12 #include "ui/views/bubble/tray_bubble_view.h" 12 #include "ui/views/bubble/tray_bubble_view.h"
13 13
14 #include <vector> 14 #include <vector>
15 15
16 namespace ash { 16 namespace ash {
17
18 class SystemTray; 17 class SystemTray;
19 class SystemTrayItem; 18 class SystemTrayItem;
20 19
21 namespace internal {
22
23 class SystemTrayBubble { 20 class SystemTrayBubble {
24 public: 21 public:
25 enum BubbleType { 22 enum BubbleType {
26 BUBBLE_TYPE_DEFAULT, 23 BUBBLE_TYPE_DEFAULT,
27 BUBBLE_TYPE_DETAILED, 24 BUBBLE_TYPE_DETAILED,
28 BUBBLE_TYPE_NOTIFICATION 25 BUBBLE_TYPE_NOTIFICATION
29 }; 26 };
30 27
31 SystemTrayBubble(ash::SystemTray* tray, 28 SystemTrayBubble(ash::SystemTray* tray,
32 const std::vector<ash::SystemTrayItem*>& items, 29 const std::vector<ash::SystemTrayItem*>& items,
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
69 views::TrayBubbleView* bubble_view_; 66 views::TrayBubbleView* bubble_view_;
70 std::vector<ash::SystemTrayItem*> items_; 67 std::vector<ash::SystemTrayItem*> items_;
71 BubbleType bubble_type_; 68 BubbleType bubble_type_;
72 69
73 int autoclose_delay_; 70 int autoclose_delay_;
74 base::OneShotTimer<SystemTrayBubble> autoclose_; 71 base::OneShotTimer<SystemTrayBubble> autoclose_;
75 72
76 DISALLOW_COPY_AND_ASSIGN(SystemTrayBubble); 73 DISALLOW_COPY_AND_ASSIGN(SystemTrayBubble);
77 }; 74 };
78 75
79 } // namespace internal
80 } // namespace ash 76 } // namespace ash
81 77
82 #endif // ASH_SYSTEM_TRAY_SYSTEM_TRAY_BUBBLE_H_ 78 #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