OLD | NEW |
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 #include "ash/system/web_notification/web_notification_tray.h" | 5 #include "ash/system/web_notification/web_notification_tray.h" |
6 | 6 |
7 #include "ash/public/cpp/shell_window_ids.h" | 7 #include "ash/public/cpp/shell_window_ids.h" |
8 #include "ash/resources/vector_icons/vector_icons.h" | 8 #include "ash/resources/vector_icons/vector_icons.h" |
9 #include "ash/root_window_controller.h" | 9 #include "ash/root_window_controller.h" |
10 #include "ash/session/session_controller.h" | 10 #include "ash/session/session_controller.h" |
| 11 #include "ash/shelf/shelf.h" |
11 #include "ash/shelf/shelf_constants.h" | 12 #include "ash/shelf/shelf_constants.h" |
12 #include "ash/shelf/wm_shelf.h" | |
13 #include "ash/shell.h" | 13 #include "ash/shell.h" |
14 #include "ash/strings/grit/ash_strings.h" | 14 #include "ash/strings/grit/ash_strings.h" |
15 #include "ash/system/status_area_widget.h" | 15 #include "ash/system/status_area_widget.h" |
16 #include "ash/system/tray/system_tray.h" | 16 #include "ash/system/tray/system_tray.h" |
17 #include "ash/system/tray/system_tray_delegate.h" | 17 #include "ash/system/tray/system_tray_delegate.h" |
18 #include "ash/system/tray/tray_bubble_wrapper.h" | 18 #include "ash/system/tray/tray_bubble_wrapper.h" |
19 #include "ash/system/tray/tray_constants.h" | 19 #include "ash/system/tray/tray_constants.h" |
20 #include "ash/system/tray/tray_container.h" | 20 #include "ash/system/tray/tray_container.h" |
21 #include "ash/system/tray/tray_utils.h" | 21 #include "ash/system/tray/tray_utils.h" |
22 #include "ash/system/web_notification/ash_popup_alignment_delegate.h" | 22 #include "ash/system/web_notification/ash_popup_alignment_delegate.h" |
(...skipping 235 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
258 view_->SetText(str); | 258 view_->SetText(str); |
259 SchedulePaint(); | 259 SchedulePaint(); |
260 } | 260 } |
261 | 261 |
262 private: | 262 private: |
263 views::Label* view_; | 263 views::Label* view_; |
264 | 264 |
265 DISALLOW_COPY_AND_ASSIGN(WebNotificationLabel); | 265 DISALLOW_COPY_AND_ASSIGN(WebNotificationLabel); |
266 }; | 266 }; |
267 | 267 |
268 WebNotificationTray::WebNotificationTray(WmShelf* shelf, | 268 WebNotificationTray::WebNotificationTray(Shelf* shelf, |
269 aura::Window* status_area_window, | 269 aura::Window* status_area_window, |
270 SystemTray* system_tray) | 270 SystemTray* system_tray) |
271 : TrayBackgroundView(shelf), | 271 : TrayBackgroundView(shelf), |
272 status_area_window_(status_area_window), | 272 status_area_window_(status_area_window), |
273 system_tray_(system_tray), | 273 system_tray_(system_tray), |
274 show_message_center_on_unlock_(false), | 274 show_message_center_on_unlock_(false), |
275 should_update_tray_content_(false) { | 275 should_update_tray_content_(false) { |
276 DCHECK(shelf); | 276 DCHECK(shelf); |
277 DCHECK(status_area_window_); | 277 DCHECK(status_area_window_); |
278 DCHECK(system_tray_); | 278 DCHECK(system_tray_); |
(...skipping 323 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
602 | 602 |
603 message_center::MessageCenterBubble* | 603 message_center::MessageCenterBubble* |
604 WebNotificationTray::GetMessageCenterBubbleForTest() { | 604 WebNotificationTray::GetMessageCenterBubbleForTest() { |
605 if (!message_center_bubble()) | 605 if (!message_center_bubble()) |
606 return nullptr; | 606 return nullptr; |
607 return static_cast<message_center::MessageCenterBubble*>( | 607 return static_cast<message_center::MessageCenterBubble*>( |
608 message_center_bubble()->bubble()); | 608 message_center_bubble()->bubble()); |
609 } | 609 } |
610 | 610 |
611 } // namespace ash | 611 } // namespace ash |
OLD | NEW |