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

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

Issue 2729363002: chromeos: Move files in //ash/common to //ash, part 3 (Closed)
Patch Set: Created 3 years, 9 months 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/system/tray/system_menu_button.cc ('k') | ash/system/tray/system_tray_bubble.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/system/tray/system_tray.h" 5 #include "ash/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
11 #include "ash/common/key_event_watcher.h" 11 #include "ash/key_event_watcher.h"
12 #include "ash/common/login_status.h" 12 #include "ash/login_status.h"
13 #include "ash/common/material_design/material_design_controller.h" 13 #include "ash/material_design/material_design_controller.h"
14 #include "ash/common/session/session_state_delegate.h"
15 #include "ash/common/wm_activation_observer.h"
16 #include "ash/common/wm_shell.h"
17 #include "ash/common/wm_window.h"
18 #include "ash/public/cpp/shell_window_ids.h" 14 #include "ash/public/cpp/shell_window_ids.h"
19 #include "ash/root_window_controller.h" 15 #include "ash/root_window_controller.h"
16 #include "ash/session/session_state_delegate.h"
20 #include "ash/shelf/wm_shelf.h" 17 #include "ash/shelf/wm_shelf.h"
21 #include "ash/shelf/wm_shelf_util.h" 18 #include "ash/shelf/wm_shelf_util.h"
22 #include "ash/strings/grit/ash_strings.h" 19 #include "ash/strings/grit/ash_strings.h"
23 #include "ash/system/audio/tray_audio.h" 20 #include "ash/system/audio/tray_audio.h"
24 #include "ash/system/bluetooth/tray_bluetooth.h" 21 #include "ash/system/bluetooth/tray_bluetooth.h"
25 #include "ash/system/brightness/tray_brightness.h" 22 #include "ash/system/brightness/tray_brightness.h"
26 #include "ash/system/cast/tray_cast.h" 23 #include "ash/system/cast/tray_cast.h"
27 #include "ash/system/date/tray_date.h" 24 #include "ash/system/date/tray_date.h"
28 #include "ash/system/date/tray_system_info.h" 25 #include "ash/system/date/tray_system_info.h"
29 #include "ash/system/enterprise/tray_enterprise.h" 26 #include "ash/system/enterprise/tray_enterprise.h"
(...skipping 14 matching lines...) Expand all
44 #include "ash/system/tray/system_tray_item.h" 41 #include "ash/system/tray/system_tray_item.h"
45 #include "ash/system/tray/tray_bubble_wrapper.h" 42 #include "ash/system/tray/tray_bubble_wrapper.h"
46 #include "ash/system/tray/tray_constants.h" 43 #include "ash/system/tray/tray_constants.h"
47 #include "ash/system/tray_accessibility.h" 44 #include "ash/system/tray_accessibility.h"
48 #include "ash/system/tray_caps_lock.h" 45 #include "ash/system/tray_caps_lock.h"
49 #include "ash/system/tray_tracing.h" 46 #include "ash/system/tray_tracing.h"
50 #include "ash/system/update/tray_update.h" 47 #include "ash/system/update/tray_update.h"
51 #include "ash/system/user/tray_user.h" 48 #include "ash/system/user/tray_user.h"
52 #include "ash/system/web_notification/web_notification_tray.h" 49 #include "ash/system/web_notification/web_notification_tray.h"
53 #include "ash/wm/container_finder.h" 50 #include "ash/wm/container_finder.h"
51 #include "ash/wm_activation_observer.h"
52 #include "ash/wm_shell.h"
53 #include "ash/wm_window.h"
54 #include "base/logging.h" 54 #include "base/logging.h"
55 #include "base/memory/ptr_util.h" 55 #include "base/memory/ptr_util.h"
56 #include "base/metrics/histogram_macros.h" 56 #include "base/metrics/histogram_macros.h"
57 #include "base/timer/timer.h" 57 #include "base/timer/timer.h"
58 #include "ui/base/accelerators/accelerator.h" 58 #include "ui/base/accelerators/accelerator.h"
59 #include "ui/base/l10n/l10n_util.h" 59 #include "ui/base/l10n/l10n_util.h"
60 #include "ui/compositor/layer.h" 60 #include "ui/compositor/layer.h"
61 #include "ui/display/display.h" 61 #include "ui/display/display.h"
62 #include "ui/display/screen.h" 62 #include "ui/display/screen.h"
63 #include "ui/events/event_constants.h" 63 #include "ui/events/event_constants.h"
(...skipping 703 matching lines...) Expand 10 before | Expand all | Expand 10 after
767 .work_area() 767 .work_area()
768 .height(); 768 .height();
769 if (work_area_height > 0) { 769 if (work_area_height > 0) {
770 UMA_HISTOGRAM_CUSTOM_COUNTS( 770 UMA_HISTOGRAM_CUSTOM_COUNTS(
771 "Ash.SystemMenu.PercentageOfWorkAreaHeightCoveredByMenu", 771 "Ash.SystemMenu.PercentageOfWorkAreaHeightCoveredByMenu",
772 100 * bubble_view->height() / work_area_height, 1, 300, 100); 772 100 * bubble_view->height() / work_area_height, 1, 300, 100);
773 } 773 }
774 } 774 }
775 775
776 } // namespace ash 776 } // namespace ash
OLDNEW
« no previous file with comments | « ash/system/tray/system_menu_button.cc ('k') | ash/system/tray/system_tray_bubble.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698