| 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/shelf/shelf_layout_manager.h" |
| 9 #include "ash/shell.h" | 9 #include "ash/shell.h" |
| 10 #include "ash/shell/panel_window.h" | 10 #include "ash/shell/panel_window.h" |
| (...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 45 #include "ui/gfx/skia_util.h" | 45 #include "ui/gfx/skia_util.h" |
| 46 #include "ui/views/border.h" | 46 #include "ui/views/border.h" |
| 47 #include "ui/views/controls/label.h" | 47 #include "ui/views/controls/label.h" |
| 48 #include "ui/views/layout/box_layout.h" | 48 #include "ui/views/layout/box_layout.h" |
| 49 #include "ui/views/layout/fill_layout.h" | 49 #include "ui/views/layout/fill_layout.h" |
| 50 #include "ui/views/view.h" | 50 #include "ui/views/view.h" |
| 51 | 51 |
| 52 #if defined(OS_CHROMEOS) | 52 #if defined(OS_CHROMEOS) |
| 53 #include "ash/system/chromeos/audio/tray_audio.h" | 53 #include "ash/system/chromeos/audio/tray_audio.h" |
| 54 #include "ash/system/chromeos/enterprise/tray_enterprise.h" | 54 #include "ash/system/chromeos/enterprise/tray_enterprise.h" |
| 55 #include "ash/system/chromeos/managed/tray_locally_managed_user.h" |
| 55 #include "ash/system/chromeos/network/tray_network.h" | 56 #include "ash/system/chromeos/network/tray_network.h" |
| 56 #include "ash/system/chromeos/network/tray_sms.h" | 57 #include "ash/system/chromeos/network/tray_sms.h" |
| 57 #include "ash/system/chromeos/network/tray_vpn.h" | 58 #include "ash/system/chromeos/network/tray_vpn.h" |
| 58 #include "ash/system/chromeos/screen_capture/tray_screen_capture.h" | 59 #include "ash/system/chromeos/screen_capture/tray_screen_capture.h" |
| 59 #include "ash/system/chromeos/tray_display.h" | 60 #include "ash/system/chromeos/tray_display.h" |
| 60 #endif | 61 #endif |
| 61 | 62 |
| 62 using views::TrayBubbleView; | 63 using views::TrayBubbleView; |
| 63 | 64 |
| 64 namespace ash { | 65 namespace ash { |
| (...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 135 } | 136 } |
| 136 | 137 |
| 137 void SystemTray::CreateItems(SystemTrayDelegate* delegate) { | 138 void SystemTray::CreateItems(SystemTrayDelegate* delegate) { |
| 138 #if !defined(OS_WIN) | 139 #if !defined(OS_WIN) |
| 139 AddTrayItem(new internal::TraySessionLengthLimit(this)); | 140 AddTrayItem(new internal::TraySessionLengthLimit(this)); |
| 140 AddTrayItem(new internal::TrayLogoutButton(this)); | 141 AddTrayItem(new internal::TrayLogoutButton(this)); |
| 141 AddTrayItem(new internal::TrayUser(this)); | 142 AddTrayItem(new internal::TrayUser(this)); |
| 142 #endif | 143 #endif |
| 143 #if defined(OS_CHROMEOS) | 144 #if defined(OS_CHROMEOS) |
| 144 AddTrayItem(new internal::TrayEnterprise(this)); | 145 AddTrayItem(new internal::TrayEnterprise(this)); |
| 146 AddTrayItem(new internal::TrayLocallyManagedUser(this)); |
| 145 #endif | 147 #endif |
| 146 AddTrayItem(new internal::TrayIME(this)); | 148 AddTrayItem(new internal::TrayIME(this)); |
| 147 tray_accessibility_ = new internal::TrayAccessibility(this); | 149 tray_accessibility_ = new internal::TrayAccessibility(this); |
| 148 AddTrayItem(tray_accessibility_); | 150 AddTrayItem(tray_accessibility_); |
| 149 #if !defined(OS_WIN) | 151 #if !defined(OS_WIN) |
| 150 AddTrayItem(new internal::TrayPower(this)); | 152 AddTrayItem(new internal::TrayPower(this)); |
| 151 #endif | 153 #endif |
| 152 #if defined(OS_CHROMEOS) | 154 #if defined(OS_CHROMEOS) |
| 153 AddTrayItem(new internal::TrayNetwork(this)); | 155 AddTrayItem(new internal::TrayNetwork(this)); |
| 154 AddTrayItem(new internal::TrayVPN(this)); | 156 AddTrayItem(new internal::TrayVPN(this)); |
| (...skipping 408 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 563 ConvertPointToWidget(this, &point); | 565 ConvertPointToWidget(this, &point); |
| 564 arrow_offset = point.x(); | 566 arrow_offset = point.x(); |
| 565 } | 567 } |
| 566 } | 568 } |
| 567 ShowDefaultViewWithOffset(BUBBLE_CREATE_NEW, arrow_offset); | 569 ShowDefaultViewWithOffset(BUBBLE_CREATE_NEW, arrow_offset); |
| 568 } | 570 } |
| 569 return true; | 571 return true; |
| 570 } | 572 } |
| 571 | 573 |
| 572 } // namespace ash | 574 } // namespace ash |
| OLD | NEW |