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/status_area_widget.h" | 5 #include "ash/common/system/status_area_widget.h" |
6 | 6 |
7 #include "ash/common/shelf/wm_shelf.h" | 7 #include "ash/common/shelf/wm_shelf.h" |
8 #include "ash/common/shell_window_ids.h" | 8 #include "ash/common/shell_window_ids.h" |
9 #include "ash/common/system/overview/overview_button_tray.h" | 9 #include "ash/common/system/overview/overview_button_tray.h" |
10 #include "ash/common/system/status_area_widget_delegate.h" | 10 #include "ash/common/system/status_area_widget_delegate.h" |
| 11 #include "ash/common/system/tray/system_tray.h" |
11 #include "ash/common/system/tray/system_tray_delegate.h" | 12 #include "ash/common/system/tray/system_tray_delegate.h" |
12 #include "ash/common/system/web_notification/web_notification_tray.h" | 13 #include "ash/common/system/web_notification/web_notification_tray.h" |
13 #include "ash/common/wm_lookup.h" | 14 #include "ash/common/wm_lookup.h" |
14 #include "ash/common/wm_root_window_controller.h" | 15 #include "ash/common/wm_root_window_controller.h" |
15 #include "ash/common/wm_shell.h" | 16 #include "ash/common/wm_shell.h" |
16 #include "ash/common/wm_window.h" | 17 #include "ash/common/wm_window.h" |
17 #include "ash/system/tray/system_tray.h" | |
18 #include "base/i18n/time_formatting.h" | 18 #include "base/i18n/time_formatting.h" |
19 | 19 |
20 #if defined(OS_CHROMEOS) | 20 #if defined(OS_CHROMEOS) |
21 #include "ash/common/system/chromeos/session/logout_button_tray.h" | 21 #include "ash/common/system/chromeos/session/logout_button_tray.h" |
22 #include "ash/common/system/chromeos/virtual_keyboard/virtual_keyboard_tray.h" | 22 #include "ash/common/system/chromeos/virtual_keyboard/virtual_keyboard_tray.h" |
23 #endif | 23 #endif |
24 | 24 |
25 namespace ash { | 25 namespace ash { |
26 | 26 |
27 StatusAreaWidget::StatusAreaWidget(WmWindow* status_container, | 27 StatusAreaWidget::StatusAreaWidget(WmWindow* status_container, |
(...skipping 171 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
199 web_notification_tray_->UpdateAfterLoginStatusChange(login_status); | 199 web_notification_tray_->UpdateAfterLoginStatusChange(login_status); |
200 #if defined(OS_CHROMEOS) | 200 #if defined(OS_CHROMEOS) |
201 if (logout_button_tray_) | 201 if (logout_button_tray_) |
202 logout_button_tray_->UpdateAfterLoginStatusChange(login_status); | 202 logout_button_tray_->UpdateAfterLoginStatusChange(login_status); |
203 #endif | 203 #endif |
204 if (overview_button_tray_) | 204 if (overview_button_tray_) |
205 overview_button_tray_->UpdateAfterLoginStatusChange(login_status); | 205 overview_button_tray_->UpdateAfterLoginStatusChange(login_status); |
206 } | 206 } |
207 | 207 |
208 } // namespace ash | 208 } // namespace ash |
OLD | NEW |