| 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 <algorithm> | 7 #include <algorithm> |
| 8 #include <map> | 8 #include <map> |
| 9 #include <vector> | 9 #include <vector> |
| 10 | 10 |
| (...skipping 804 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 815 } | 815 } |
| 816 | 816 |
| 817 TraySystemInfo* SystemTray::GetTraySystemInfoForTesting() const { | 817 TraySystemInfo* SystemTray::GetTraySystemInfoForTesting() const { |
| 818 return tray_system_info_; | 818 return tray_system_info_; |
| 819 } | 819 } |
| 820 | 820 |
| 821 TrayTiles* SystemTray::GetTrayTilesForTesting() const { | 821 TrayTiles* SystemTray::GetTrayTilesForTesting() const { |
| 822 return tray_tiles_; | 822 return tray_tiles_; |
| 823 } | 823 } |
| 824 | 824 |
| 825 TrayUpdate* SystemTray::GetTrayUpdateForTesting() const { |
| 826 return tray_update_; |
| 827 } |
| 828 |
| 825 void SystemTray::CloseBubble(const ui::KeyEvent& key_event) { | 829 void SystemTray::CloseBubble(const ui::KeyEvent& key_event) { |
| 826 CloseSystemBubble(); | 830 CloseSystemBubble(); |
| 827 } | 831 } |
| 828 | 832 |
| 829 void SystemTray::ActivateAndStartNavigation(const ui::KeyEvent& key_event) { | 833 void SystemTray::ActivateAndStartNavigation(const ui::KeyEvent& key_event) { |
| 830 if (!system_bubble_) | 834 if (!system_bubble_) |
| 831 return; | 835 return; |
| 832 activating_ = true; | 836 activating_ = true; |
| 833 ActivateBubble(); | 837 ActivateBubble(); |
| 834 activating_ = false; | 838 activating_ = false; |
| (...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 911 .work_area() | 915 .work_area() |
| 912 .height(); | 916 .height(); |
| 913 if (work_area_height > 0) { | 917 if (work_area_height > 0) { |
| 914 UMA_HISTOGRAM_CUSTOM_COUNTS( | 918 UMA_HISTOGRAM_CUSTOM_COUNTS( |
| 915 "Ash.SystemMenu.PercentageOfWorkAreaHeightCoveredByMenu", | 919 "Ash.SystemMenu.PercentageOfWorkAreaHeightCoveredByMenu", |
| 916 100 * bubble_view->height() / work_area_height, 1, 300, 100); | 920 100 * bubble_view->height() / work_area_height, 1, 300, 100); |
| 917 } | 921 } |
| 918 } | 922 } |
| 919 | 923 |
| 920 } // namespace ash | 924 } // namespace ash |
| OLD | NEW |