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/common/system/tray/system_tray.h" | 5 #include "ash/common/system/tray/system_tray.h" |
6 | 6 |
7 #include "ash/common/key_event_watcher.h" | 7 #include "ash/common/key_event_watcher.h" |
8 #include "ash/common/login_status.h" | 8 #include "ash/common/login_status.h" |
9 #include "ash/common/material_design/material_design_controller.h" | 9 #include "ash/common/material_design/material_design_controller.h" |
10 #include "ash/common/session/session_state_delegate.h" | 10 #include "ash/common/session/session_state_delegate.h" |
(...skipping 549 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
560 } | 560 } |
561 | 561 |
562 void SystemTray::ShowItems(const std::vector<SystemTrayItem*>& items, | 562 void SystemTray::ShowItems(const std::vector<SystemTrayItem*>& items, |
563 bool detailed, | 563 bool detailed, |
564 bool can_activate, | 564 bool can_activate, |
565 BubbleCreationType creation_type, | 565 BubbleCreationType creation_type, |
566 int arrow_offset, | 566 int arrow_offset, |
567 bool persistent) { | 567 bool persistent) { |
568 // No system tray bubbles in kiosk mode. | 568 // No system tray bubbles in kiosk mode. |
569 if (WmShell::Get()->system_tray_delegate()->GetUserLoginStatus() == | 569 if (WmShell::Get()->system_tray_delegate()->GetUserLoginStatus() == |
570 LoginStatus::KIOSK_APP) { | 570 LoginStatus::KIOSK_APP || |
| 571 WmShell::Get()->system_tray_delegate()->GetUserLoginStatus() == |
| 572 LoginStatus::ARC_KIOSK_APP) { |
571 return; | 573 return; |
572 } | 574 } |
573 | 575 |
574 // Destroy any existing bubble and create a new one. | 576 // Destroy any existing bubble and create a new one. |
575 SystemTrayBubble::BubbleType bubble_type = | 577 SystemTrayBubble::BubbleType bubble_type = |
576 detailed ? SystemTrayBubble::BUBBLE_TYPE_DETAILED | 578 detailed ? SystemTrayBubble::BUBBLE_TYPE_DETAILED |
577 : SystemTrayBubble::BUBBLE_TYPE_DEFAULT; | 579 : SystemTrayBubble::BUBBLE_TYPE_DEFAULT; |
578 | 580 |
579 // Destroy the notification bubble here so that it doesn't get rebuilt | 581 // Destroy the notification bubble here so that it doesn't get rebuilt |
580 // while we add items to the main bubble_ (e.g. in HideNotificationView). | 582 // while we add items to the main bubble_ (e.g. in HideNotificationView). |
(...skipping 373 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
954 .work_area() | 956 .work_area() |
955 .height(); | 957 .height(); |
956 if (work_area_height > 0) { | 958 if (work_area_height > 0) { |
957 UMA_HISTOGRAM_CUSTOM_COUNTS( | 959 UMA_HISTOGRAM_CUSTOM_COUNTS( |
958 "Ash.SystemMenu.PercentageOfWorkAreaHeightCoveredByMenu", | 960 "Ash.SystemMenu.PercentageOfWorkAreaHeightCoveredByMenu", |
959 100 * bubble_view->height() / work_area_height, 1, 300, 100); | 961 100 * bubble_view->height() / work_area_height, 1, 300, 100); |
960 } | 962 } |
961 } | 963 } |
962 | 964 |
963 } // namespace ash | 965 } // namespace ash |
OLD | NEW |