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

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

Issue 10417013: Show fixed arrow for uber tray bubble if shelf alignment is vertical. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 7 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 #pragma once 7 #pragma once
8 8
9 #include "ash/system/user/login_status.h" 9 #include "ash/system/user/login_status.h"
10 #include "ash/wm/shelf_auto_hide_behavior.h"
10 #include "base/base_export.h" 11 #include "base/base_export.h"
11 #include "base/message_pump_observer.h" 12 #include "base/message_pump_observer.h"
12 #include "base/timer.h" 13 #include "base/timer.h"
13 #include "ui/views/bubble/bubble_delegate.h" 14 #include "ui/views/bubble/bubble_delegate.h"
14 #include "ui/views/widget/widget.h" 15 #include "ui/views/widget/widget.h"
15 16
16 #include <vector> 17 #include <vector>
17 18
18 namespace ash { 19 namespace ash {
19 20
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
67 BUBBLE_TYPE_DETAILED, 68 BUBBLE_TYPE_DETAILED,
68 BUBBLE_TYPE_NOTIFICATION 69 BUBBLE_TYPE_NOTIFICATION
69 }; 70 };
70 71
71 enum AnchorType { 72 enum AnchorType {
72 ANCHOR_TYPE_TRAY, 73 ANCHOR_TYPE_TRAY,
73 ANCHOR_TYPE_BUBBLE 74 ANCHOR_TYPE_BUBBLE
74 }; 75 };
75 76
76 struct InitParams { 77 struct InitParams {
77 InitParams(AnchorType anchor_type); 78 InitParams(AnchorType anchor_type, ShelfAlignment shelf_alignmen);
78 79
79 views::View* anchor; 80 views::View* anchor;
80 AnchorType anchor_type; 81 AnchorType anchor_type;
81 bool can_activate; 82 bool can_activate;
82 ash::user::LoginStatus login_status; 83 ash::user::LoginStatus login_status;
83 int arrow_offset; 84 int arrow_offset;
84 }; 85 };
85 86
86 SystemTrayBubble(ash::SystemTray* tray, 87 SystemTrayBubble(ash::SystemTray* tray,
87 const std::vector<ash::SystemTrayItem*>& items, 88 const std::vector<ash::SystemTrayItem*>& items,
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
129 int autoclose_delay_; 130 int autoclose_delay_;
130 base::OneShotTimer<SystemTrayBubble> autoclose_; 131 base::OneShotTimer<SystemTrayBubble> autoclose_;
131 132
132 DISALLOW_COPY_AND_ASSIGN(SystemTrayBubble); 133 DISALLOW_COPY_AND_ASSIGN(SystemTrayBubble);
133 }; 134 };
134 135
135 } // namespace internal 136 } // namespace internal
136 } // namespace ash 137 } // namespace ash
137 138
138 #endif // ASH_SYSTEM_TRAY_SYSTEM_TRAY_BUBBLE_H_ 139 #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