| 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/ash_switches.h" | 7 #include "ash/common/ash_switches.h" |
| 8 #include "ash/common/login_status.h" | 8 #include "ash/common/login_status.h" |
| 9 #include "ash/common/session/session_state_delegate.h" | 9 #include "ash/common/session/session_state_delegate.h" |
| 10 #include "ash/common/shelf/wm_shelf.h" | 10 #include "ash/common/shelf/wm_shelf.h" |
| (...skipping 21 matching lines...) Expand all Loading... |
| 32 #include "grit/ash_strings.h" | 32 #include "grit/ash_strings.h" |
| 33 #include "ui/base/l10n/l10n_util.h" | 33 #include "ui/base/l10n/l10n_util.h" |
| 34 #include "ui/compositor/layer.h" | 34 #include "ui/compositor/layer.h" |
| 35 #include "ui/display/display.h" | 35 #include "ui/display/display.h" |
| 36 #include "ui/display/screen.h" | 36 #include "ui/display/screen.h" |
| 37 #include "ui/events/event_constants.h" | 37 #include "ui/events/event_constants.h" |
| 38 #include "ui/gfx/canvas.h" | 38 #include "ui/gfx/canvas.h" |
| 39 #include "ui/gfx/skia_util.h" | 39 #include "ui/gfx/skia_util.h" |
| 40 #include "ui/views/border.h" | 40 #include "ui/views/border.h" |
| 41 #include "ui/views/controls/label.h" | 41 #include "ui/views/controls/label.h" |
| 42 #include "ui/views/layout/box_layout.h" | |
| 43 #include "ui/views/layout/fill_layout.h" | |
| 44 #include "ui/views/view.h" | 42 #include "ui/views/view.h" |
| 45 #include "ui/views/widget/widget.h" | 43 #include "ui/views/widget/widget.h" |
| 46 | 44 |
| 47 #if defined(OS_CHROMEOS) | 45 #if defined(OS_CHROMEOS) |
| 48 #include "ash/common/system/chromeos/audio/tray_audio_chromeos.h" | 46 #include "ash/common/system/chromeos/audio/tray_audio_chromeos.h" |
| 49 #include "ash/common/system/chromeos/bluetooth/tray_bluetooth.h" | 47 #include "ash/common/system/chromeos/bluetooth/tray_bluetooth.h" |
| 50 #include "ash/common/system/chromeos/brightness/tray_brightness.h" | 48 #include "ash/common/system/chromeos/brightness/tray_brightness.h" |
| 51 #include "ash/common/system/chromeos/enterprise/tray_enterprise.h" | 49 #include "ash/common/system/chromeos/enterprise/tray_enterprise.h" |
| 52 #include "ash/common/system/chromeos/media_security/multi_profile_media_tray_ite
m.h" | 50 #include "ash/common/system/chromeos/media_security/multi_profile_media_tray_ite
m.h" |
| 53 #include "ash/common/system/chromeos/network/tray_network.h" | 51 #include "ash/common/system/chromeos/network/tray_network.h" |
| (...skipping 734 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 788 .work_area() | 786 .work_area() |
| 789 .height(); | 787 .height(); |
| 790 if (work_area_height > 0) { | 788 if (work_area_height > 0) { |
| 791 UMA_HISTOGRAM_CUSTOM_COUNTS( | 789 UMA_HISTOGRAM_CUSTOM_COUNTS( |
| 792 "Ash.SystemMenu.PercentageOfWorkAreaHeightCoveredByMenu", | 790 "Ash.SystemMenu.PercentageOfWorkAreaHeightCoveredByMenu", |
| 793 100 * bubble_view->height() / work_area_height, 1, 300, 100); | 791 100 * bubble_view->height() / work_area_height, 1, 300, 100); |
| 794 } | 792 } |
| 795 } | 793 } |
| 796 | 794 |
| 797 } // namespace ash | 795 } // namespace ash |
| OLD | NEW |