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

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

Issue 2092473002: Convert TrayBubbleView to wm common types (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@traybubblewrapper
Patch Set: review feedback Created 4 years, 6 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
« no previous file with comments | « no previous file | 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 <map> 8 #include <map>
9 #include <memory> 9 #include <memory>
10 #include <vector> 10 #include <vector>
(...skipping 114 matching lines...) Expand 10 before | Expand all | Expand 10 after
125 bool CloseNotificationBubbleForTest() const; 125 bool CloseNotificationBubbleForTest() const;
126 126
127 // Overridden from TrayBackgroundView. 127 // Overridden from TrayBackgroundView.
128 void SetShelfAlignment(ShelfAlignment alignment) override; 128 void SetShelfAlignment(ShelfAlignment alignment) override;
129 void AnchorUpdated() override; 129 void AnchorUpdated() override;
130 base::string16 GetAccessibleNameForTray() override; 130 base::string16 GetAccessibleNameForTray() override;
131 void BubbleResized(const views::TrayBubbleView* bubble_view) override; 131 void BubbleResized(const views::TrayBubbleView* bubble_view) override;
132 void HideBubbleWithView(const views::TrayBubbleView* bubble_view) override; 132 void HideBubbleWithView(const views::TrayBubbleView* bubble_view) override;
133 void ClickedOutsideBubble() override; 133 void ClickedOutsideBubble() override;
134 134
135 // Overridden from message_center::TrayBubbleView::Delegate. 135 // views::TrayBubbleView::Delegate:
136 void BubbleViewDestroyed() override; 136 void BubbleViewDestroyed() override;
137 void OnMouseEnteredView() override; 137 void OnMouseEnteredView() override;
138 void OnMouseExitedView() override; 138 void OnMouseExitedView() override;
139 base::string16 GetAccessibleNameForBubble() override; 139 base::string16 GetAccessibleNameForBubble() override;
140 gfx::Rect GetAnchorRect(views::Widget* anchor_widget, 140 gfx::Rect GetAnchorRect(views::Widget* anchor_widget,
141 AnchorType anchor_type, 141 AnchorType anchor_type,
142 AnchorAlignment anchor_alignment) const override; 142 AnchorAlignment anchor_alignment) const override;
143 void OnBeforeBubbleWidgetInit(
144 views::Widget* anchor_widget,
145 views::Widget* bubble_widget,
146 views::Widget::InitParams* params) const override;
143 void HideBubble(const views::TrayBubbleView* bubble_view) override; 147 void HideBubble(const views::TrayBubbleView* bubble_view) override;
144 148
145 ScreenTrayItem* GetScreenShareItem() { return screen_share_tray_item_; } 149 ScreenTrayItem* GetScreenShareItem() { return screen_share_tray_item_; }
146 ScreenTrayItem* GetScreenCaptureItem() { return screen_capture_tray_item_; } 150 ScreenTrayItem* GetScreenCaptureItem() { return screen_capture_tray_item_; }
147 151
148 TrayAccessibility* GetTrayAccessibilityForTest() { 152 TrayAccessibility* GetTrayAccessibilityForTest() {
149 return tray_accessibility_; 153 return tray_accessibility_;
150 } 154 }
151 155
152 // Get the tray item view (or NULL) for a given |tray_item| in a unit test. 156 // Get the tray item view (or NULL) for a given |tray_item| in a unit test.
(...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after
246 // A reference to the Screen share and capture item. 250 // A reference to the Screen share and capture item.
247 ScreenTrayItem* screen_capture_tray_item_; // not owned 251 ScreenTrayItem* screen_capture_tray_item_; // not owned
248 ScreenTrayItem* screen_share_tray_item_; // not owned 252 ScreenTrayItem* screen_share_tray_item_; // not owned
249 253
250 DISALLOW_COPY_AND_ASSIGN(SystemTray); 254 DISALLOW_COPY_AND_ASSIGN(SystemTray);
251 }; 255 };
252 256
253 } // namespace ash 257 } // namespace ash
254 258
255 #endif // ASH_SYSTEM_TRAY_SYSTEM_TRAY_H_ 259 #endif // ASH_SYSTEM_TRAY_SYSTEM_TRAY_H_
OLDNEW
« no previous file with comments | « no previous file | ash/system/tray/system_tray.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698