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/tray/system_tray.h" | 5 #include "ash/system/tray/system_tray.h" |
6 | 6 |
7 #include "ash/common/ash_switches.h" | 7 #include "ash/common/ash_switches.h" |
8 #include "ash/common/session/session_state_delegate.h" | 8 #include "ash/common/session/session_state_delegate.h" |
9 #include "ash/common/shelf/wm_shelf.h" | 9 #include "ash/common/shelf/wm_shelf.h" |
10 #include "ash/common/shelf/wm_shelf_util.h" | 10 #include "ash/common/shelf/wm_shelf_util.h" |
11 #include "ash/common/shell_window_ids.h" | 11 #include "ash/common/shell_window_ids.h" |
12 #include "ash/common/system/date/tray_date.h" | 12 #include "ash/common/system/date/tray_date.h" |
13 #include "ash/common/system/tray/system_tray_delegate.h" | 13 #include "ash/common/system/tray/system_tray_delegate.h" |
14 #include "ash/common/system/tray/system_tray_item.h" | 14 #include "ash/common/system/tray/system_tray_item.h" |
15 #include "ash/common/system/tray/tray_constants.h" | 15 #include "ash/common/system/tray/tray_constants.h" |
16 #include "ash/common/system/tray_accessibility.h" | 16 #include "ash/common/system/tray_accessibility.h" |
17 #include "ash/common/system/update/tray_update.h" | 17 #include "ash/common/system/update/tray_update.h" |
| 18 #include "ash/common/wm_lookup.h" |
| 19 #include "ash/common/wm_root_window_controller.h" |
18 #include "ash/common/wm_shell.h" | 20 #include "ash/common/wm_shell.h" |
| 21 #include "ash/common/wm_window.h" |
19 #include "ash/metrics/user_metrics_recorder.h" | 22 #include "ash/metrics/user_metrics_recorder.h" |
20 #include "ash/shell.h" | 23 #include "ash/shell.h" |
21 #include "ash/system/audio/tray_audio.h" | 24 #include "ash/system/audio/tray_audio.h" |
22 #include "ash/system/cast/tray_cast.h" | 25 #include "ash/system/cast/tray_cast.h" |
23 #include "ash/system/status_area_widget.h" | 26 #include "ash/system/status_area_widget.h" |
24 #include "ash/system/tray/tray_bubble_wrapper.h" | 27 #include "ash/system/tray/tray_bubble_wrapper.h" |
25 #include "ash/system/user/login_status.h" | 28 #include "ash/system/user/login_status.h" |
26 #include "ash/system/user/tray_user.h" | 29 #include "ash/system/user/tray_user.h" |
27 #include "ash/system/user/tray_user_separator.h" | 30 #include "ash/system/user/tray_user_separator.h" |
28 #include "ash/system/web_notification/web_notification_tray.h" | 31 #include "ash/system/web_notification/web_notification_tray.h" |
(...skipping 655 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
684 return GetAccessibleNameForTray(); | 687 return GetAccessibleNameForTray(); |
685 } | 688 } |
686 | 689 |
687 gfx::Rect SystemTray::GetAnchorRect( | 690 gfx::Rect SystemTray::GetAnchorRect( |
688 views::Widget* anchor_widget, | 691 views::Widget* anchor_widget, |
689 TrayBubbleView::AnchorType anchor_type, | 692 TrayBubbleView::AnchorType anchor_type, |
690 TrayBubbleView::AnchorAlignment anchor_alignment) const { | 693 TrayBubbleView::AnchorAlignment anchor_alignment) const { |
691 return GetBubbleAnchorRect(anchor_widget, anchor_type, anchor_alignment); | 694 return GetBubbleAnchorRect(anchor_widget, anchor_type, anchor_alignment); |
692 } | 695 } |
693 | 696 |
| 697 void SystemTray::OnBeforeBubbleWidgetInit( |
| 698 views::Widget* anchor_widget, |
| 699 views::Widget* bubble_widget, |
| 700 views::Widget::InitParams* params) const { |
| 701 // Place the bubble in the same root window as |anchor_widget|. |
| 702 WmLookup::Get() |
| 703 ->GetWindowForWidget(anchor_widget) |
| 704 ->GetRootWindowController() |
| 705 ->ConfigureWidgetInitParamsForContainer( |
| 706 bubble_widget, kShellWindowId_SettingBubbleContainer, params); |
| 707 } |
| 708 |
694 void SystemTray::HideBubble(const TrayBubbleView* bubble_view) { | 709 void SystemTray::HideBubble(const TrayBubbleView* bubble_view) { |
695 HideBubbleWithView(bubble_view); | 710 HideBubbleWithView(bubble_view); |
696 } | 711 } |
697 | 712 |
698 views::View* SystemTray::GetTrayItemViewForTest(SystemTrayItem* item) { | 713 views::View* SystemTray::GetTrayItemViewForTest(SystemTrayItem* item) { |
699 std::map<SystemTrayItem*, views::View*>::iterator it = | 714 std::map<SystemTrayItem*, views::View*>::iterator it = |
700 tray_item_map_.find(item); | 715 tray_item_map_.find(item); |
701 return it == tray_item_map_.end() ? NULL : it->second; | 716 return it == tray_item_map_.end() ? NULL : it->second; |
702 } | 717 } |
703 | 718 |
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
759 .work_area() | 774 .work_area() |
760 .height(); | 775 .height(); |
761 if (work_area_height > 0) { | 776 if (work_area_height > 0) { |
762 UMA_HISTOGRAM_CUSTOM_COUNTS( | 777 UMA_HISTOGRAM_CUSTOM_COUNTS( |
763 "Ash.SystemMenu.PercentageOfWorkAreaHeightCoveredByMenu", | 778 "Ash.SystemMenu.PercentageOfWorkAreaHeightCoveredByMenu", |
764 100 * bubble_view->height() / work_area_height, 1, 300, 100); | 779 100 * bubble_view->height() / work_area_height, 1, 300, 100); |
765 } | 780 } |
766 } | 781 } |
767 | 782 |
768 } // namespace ash | 783 } // namespace ash |
OLD | NEW |