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

Side by Side Diff: ash/common/system/tray/system_tray.cc

Issue 2558043006: ash: Use system tray mojo interface to show system update tray icon (Closed)
Patch Set: fix gcc Created 4 years 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 | « ash/common/system/tray/system_tray.h ('k') | ash/common/system/tray/system_tray_controller.h » ('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 #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
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
829 void SystemTray::CloseBubble(const ui::KeyEvent& key_event) { 825 void SystemTray::CloseBubble(const ui::KeyEvent& key_event) {
830 CloseSystemBubble(); 826 CloseSystemBubble();
831 } 827 }
832 828
833 void SystemTray::ActivateAndStartNavigation(const ui::KeyEvent& key_event) { 829 void SystemTray::ActivateAndStartNavigation(const ui::KeyEvent& key_event) {
834 if (!system_bubble_) 830 if (!system_bubble_)
835 return; 831 return;
836 activating_ = true; 832 activating_ = true;
837 ActivateBubble(); 833 ActivateBubble();
838 activating_ = false; 834 activating_ = false;
(...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after
915 .work_area() 911 .work_area()
916 .height(); 912 .height();
917 if (work_area_height > 0) { 913 if (work_area_height > 0) {
918 UMA_HISTOGRAM_CUSTOM_COUNTS( 914 UMA_HISTOGRAM_CUSTOM_COUNTS(
919 "Ash.SystemMenu.PercentageOfWorkAreaHeightCoveredByMenu", 915 "Ash.SystemMenu.PercentageOfWorkAreaHeightCoveredByMenu",
920 100 * bubble_view->height() / work_area_height, 1, 300, 100); 916 100 * bubble_view->height() / work_area_height, 1, 300, 100);
921 } 917 }
922 } 918 }
923 919
924 } // namespace ash 920 } // namespace ash
OLDNEW
« no previous file with comments | « ash/common/system/tray/system_tray.h ('k') | ash/common/system/tray/system_tray_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698