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/system/status_area_widget.h" |
6 | 6 |
7 #include "ash/common/shell_window_ids.h" | 7 #include "ash/common/shell_window_ids.h" |
8 #include "ash/common/wm/wm_root_window_controller.h" | 8 #include "ash/common/wm_root_window_controller.h" |
9 #include "ash/common/wm/wm_window.h" | 9 #include "ash/common/wm_window.h" |
10 #include "ash/shelf/shelf_layout_manager.h" | 10 #include "ash/shelf/shelf_layout_manager.h" |
11 #include "ash/shelf/shelf_widget.h" | 11 #include "ash/shelf/shelf_widget.h" |
12 #include "ash/shell.h" | 12 #include "ash/shell.h" |
13 #include "ash/shell_delegate.h" | 13 #include "ash/shell_delegate.h" |
14 #include "ash/system/overview/overview_button_tray.h" | 14 #include "ash/system/overview/overview_button_tray.h" |
15 #include "ash/system/status_area_widget_delegate.h" | 15 #include "ash/system/status_area_widget_delegate.h" |
16 #include "ash/system/tray/system_tray.h" | 16 #include "ash/system/tray/system_tray.h" |
17 #include "ash/system/tray/system_tray_delegate.h" | 17 #include "ash/system/tray/system_tray_delegate.h" |
18 #include "ash/system/web_notification/web_notification_tray.h" | 18 #include "ash/system/web_notification/web_notification_tray.h" |
19 #include "ash/wm/window_properties.h" | 19 #include "ash/wm/window_properties.h" |
20 #include "base/i18n/time_formatting.h" | 20 #include "base/i18n/time_formatting.h" |
21 | 21 |
22 #if defined(OS_CHROMEOS) | 22 #if defined(OS_CHROMEOS) |
23 #include "ash/system/chromeos/session/logout_button_tray.h" | 23 #include "ash/system/chromeos/session/logout_button_tray.h" |
24 #include "ash/system/chromeos/virtual_keyboard/virtual_keyboard_tray.h" | 24 #include "ash/system/chromeos/virtual_keyboard/virtual_keyboard_tray.h" |
25 #endif | 25 #endif |
26 | 26 |
27 namespace ash { | 27 namespace ash { |
28 | 28 |
29 StatusAreaWidget::StatusAreaWidget(wm::WmWindow* status_container, | 29 StatusAreaWidget::StatusAreaWidget(WmWindow* status_container, |
30 ShelfWidget* shelf_widget) | 30 ShelfWidget* shelf_widget) |
31 : status_area_widget_delegate_(new StatusAreaWidgetDelegate), | 31 : status_area_widget_delegate_(new StatusAreaWidgetDelegate), |
32 overview_button_tray_(NULL), | 32 overview_button_tray_(NULL), |
33 system_tray_(NULL), | 33 system_tray_(NULL), |
34 web_notification_tray_(NULL), | 34 web_notification_tray_(NULL), |
35 #if defined(OS_CHROMEOS) | 35 #if defined(OS_CHROMEOS) |
36 logout_button_tray_(NULL), | 36 logout_button_tray_(NULL), |
37 virtual_keyboard_tray_(NULL), | 37 virtual_keyboard_tray_(NULL), |
38 #endif | 38 #endif |
39 login_status_(user::LOGGED_IN_NONE), | 39 login_status_(user::LOGGED_IN_NONE), |
(...skipping 167 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
207 web_notification_tray_->UpdateAfterLoginStatusChange(login_status); | 207 web_notification_tray_->UpdateAfterLoginStatusChange(login_status); |
208 #if defined(OS_CHROMEOS) | 208 #if defined(OS_CHROMEOS) |
209 if (logout_button_tray_) | 209 if (logout_button_tray_) |
210 logout_button_tray_->UpdateAfterLoginStatusChange(login_status); | 210 logout_button_tray_->UpdateAfterLoginStatusChange(login_status); |
211 #endif | 211 #endif |
212 if (overview_button_tray_) | 212 if (overview_button_tray_) |
213 overview_button_tray_->UpdateAfterLoginStatusChange(login_status); | 213 overview_button_tray_->UpdateAfterLoginStatusChange(login_status); |
214 } | 214 } |
215 | 215 |
216 } // namespace ash | 216 } // namespace ash |
OLD | NEW |