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/system/tray/system_tray.h" | 5 #include "ash/system/tray/system_tray.h" |
6 | 6 |
7 #include "ash/ash_switches.h" | 7 #include "ash/ash_switches.h" |
| 8 #include "ash/shelf/shelf_layout_manager.h" |
8 #include "ash/shell.h" | 9 #include "ash/shell.h" |
9 #include "ash/shell/panel_window.h" | 10 #include "ash/shell/panel_window.h" |
10 #include "ash/shell_window_ids.h" | 11 #include "ash/shell_window_ids.h" |
11 #include "ash/system/audio/tray_volume.h" | 12 #include "ash/system/audio/tray_volume.h" |
12 #include "ash/system/bluetooth/tray_bluetooth.h" | 13 #include "ash/system/bluetooth/tray_bluetooth.h" |
13 #include "ash/system/brightness/tray_brightness.h" | 14 #include "ash/system/brightness/tray_brightness.h" |
14 #include "ash/system/chromeos/tray_display.h" | 15 #include "ash/system/chromeos/tray_display.h" |
15 #include "ash/system/date/tray_date.h" | 16 #include "ash/system/date/tray_date.h" |
16 #include "ash/system/drive/tray_drive.h" | 17 #include "ash/system/drive/tray_drive.h" |
17 #include "ash/system/ime/tray_ime.h" | 18 #include "ash/system/ime/tray_ime.h" |
18 #include "ash/system/locale/tray_locale.h" | 19 #include "ash/system/locale/tray_locale.h" |
19 #include "ash/system/logout_button/tray_logout_button.h" | 20 #include "ash/system/logout_button/tray_logout_button.h" |
20 #include "ash/system/monitor/tray_monitor.h" | 21 #include "ash/system/monitor/tray_monitor.h" |
21 #include "ash/system/power/power_supply_status.h" | 22 #include "ash/system/power/power_supply_status.h" |
22 #include "ash/system/power/tray_power.h" | 23 #include "ash/system/power/tray_power.h" |
23 #include "ash/system/session_length_limit/tray_session_length_limit.h" | 24 #include "ash/system/session_length_limit/tray_session_length_limit.h" |
24 #include "ash/system/settings/tray_settings.h" | 25 #include "ash/system/settings/tray_settings.h" |
25 #include "ash/system/status_area_widget.h" | 26 #include "ash/system/status_area_widget.h" |
26 #include "ash/system/tray/system_tray_delegate.h" | 27 #include "ash/system/tray/system_tray_delegate.h" |
27 #include "ash/system/tray/system_tray_item.h" | 28 #include "ash/system/tray/system_tray_item.h" |
28 #include "ash/system/tray/tray_bubble_wrapper.h" | 29 #include "ash/system/tray/tray_bubble_wrapper.h" |
29 #include "ash/system/tray/tray_constants.h" | 30 #include "ash/system/tray/tray_constants.h" |
30 #include "ash/system/tray_accessibility.h" | 31 #include "ash/system/tray_accessibility.h" |
31 #include "ash/system/tray_caps_lock.h" | 32 #include "ash/system/tray_caps_lock.h" |
32 #include "ash/system/tray_update.h" | 33 #include "ash/system/tray_update.h" |
33 #include "ash/system/user/login_status.h" | 34 #include "ash/system/user/login_status.h" |
34 #include "ash/system/user/tray_user.h" | 35 #include "ash/system/user/tray_user.h" |
35 #include "ash/wm/shelf_layout_manager.h" | |
36 #include "base/command_line.h" | 36 #include "base/command_line.h" |
37 #include "base/logging.h" | 37 #include "base/logging.h" |
38 #include "base/timer.h" | 38 #include "base/timer.h" |
39 #include "base/utf_string_conversions.h" | 39 #include "base/utf_string_conversions.h" |
40 #include "grit/ash_strings.h" | 40 #include "grit/ash_strings.h" |
41 #include "ui/aura/root_window.h" | 41 #include "ui/aura/root_window.h" |
42 #include "ui/base/events/event_constants.h" | 42 #include "ui/base/events/event_constants.h" |
43 #include "ui/base/l10n/l10n_util.h" | 43 #include "ui/base/l10n/l10n_util.h" |
44 #include "ui/compositor/layer.h" | 44 #include "ui/compositor/layer.h" |
45 #include "ui/gfx/canvas.h" | 45 #include "ui/gfx/canvas.h" |
(...skipping 489 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
535 ConvertPointToWidget(this, &point); | 535 ConvertPointToWidget(this, &point); |
536 arrow_offset = point.x(); | 536 arrow_offset = point.x(); |
537 } | 537 } |
538 } | 538 } |
539 ShowDefaultViewWithOffset(BUBBLE_CREATE_NEW, arrow_offset); | 539 ShowDefaultViewWithOffset(BUBBLE_CREATE_NEW, arrow_offset); |
540 } | 540 } |
541 return true; | 541 return true; |
542 } | 542 } |
543 | 543 |
544 } // namespace ash | 544 } // namespace ash |
OLD | NEW |