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/shell.h" | 7 #include "ash/shell.h" |
8 #include "ash/shell/panel_window.h" | 8 #include "ash/shell/panel_window.h" |
9 #include "ash/shell_window_ids.h" | 9 #include "ash/shell_window_ids.h" |
10 #include "ash/system/audio/tray_volume.h" | 10 #include "ash/system/audio/tray_volume.h" |
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
48 #include "ui/views/view.h" | 48 #include "ui/views/view.h" |
49 | 49 |
50 namespace ash { | 50 namespace ash { |
51 | 51 |
52 // SystemTray | 52 // SystemTray |
53 | 53 |
54 using internal::SystemTrayBubble; | 54 using internal::SystemTrayBubble; |
55 using internal::TrayBubbleView; | 55 using internal::TrayBubbleView; |
56 | 56 |
57 SystemTray::SystemTray(internal::StatusAreaWidget* status_area_widget) | 57 SystemTray::SystemTray(internal::StatusAreaWidget* status_area_widget) |
58 : internal::TrayBackgroundView(status_area_widget), | 58 : internal::TrayBackgroundView(status_area_widget, true), |
59 items_(), | 59 items_(), |
60 accessibility_observer_(NULL), | 60 accessibility_observer_(NULL), |
61 audio_observer_(NULL), | 61 audio_observer_(NULL), |
62 bluetooth_observer_(NULL), | 62 bluetooth_observer_(NULL), |
63 brightness_observer_(NULL), | 63 brightness_observer_(NULL), |
64 caps_lock_observer_(NULL), | 64 caps_lock_observer_(NULL), |
65 clock_observer_(NULL), | 65 clock_observer_(NULL), |
66 drive_observer_(NULL), | 66 drive_observer_(NULL), |
67 ime_observer_(NULL), | 67 ime_observer_(NULL), |
68 locale_observer_(NULL), | 68 locale_observer_(NULL), |
(...skipping 375 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
444 ConvertPointToWidget(this, &point); | 444 ConvertPointToWidget(this, &point); |
445 arrow_offset = point.x(); | 445 arrow_offset = point.x(); |
446 } | 446 } |
447 } | 447 } |
448 ShowDefaultViewWithOffset(BUBBLE_CREATE_NEW, arrow_offset); | 448 ShowDefaultViewWithOffset(BUBBLE_CREATE_NEW, arrow_offset); |
449 } | 449 } |
450 return true; | 450 return true; |
451 } | 451 } |
452 | 452 |
453 } // namespace ash | 453 } // namespace ash |
OLD | NEW |