| 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/root_window_controller.h" | 7 #include "ash/root_window_controller.h" |
| 8 #include "ash/shelf/shelf_layout_manager.h" | 8 #include "ash/shelf/shelf_layout_manager.h" |
| 9 #include "ash/shelf/shelf_widget.h" | 9 #include "ash/shelf/shelf_widget.h" |
| 10 #include "ash/shell.h" | 10 #include "ash/shell.h" |
| (...skipping 10 matching lines...) Expand all Loading... |
| 21 #include "ui/aura/window.h" | 21 #include "ui/aura/window.h" |
| 22 #include "ui/gfx/screen.h" | 22 #include "ui/gfx/screen.h" |
| 23 | 23 |
| 24 #if defined(OS_CHROMEOS) | 24 #if defined(OS_CHROMEOS) |
| 25 #include "ash/system/chromeos/session/logout_button_tray.h" | 25 #include "ash/system/chromeos/session/logout_button_tray.h" |
| 26 #include "ash/system/chromeos/virtual_keyboard/virtual_keyboard_tray.h" | 26 #include "ash/system/chromeos/virtual_keyboard/virtual_keyboard_tray.h" |
| 27 #endif | 27 #endif |
| 28 | 28 |
| 29 namespace ash { | 29 namespace ash { |
| 30 | 30 |
| 31 namespace internal { | |
| 32 | |
| 33 const char StatusAreaWidget::kNativeViewName[] = "StatusAreaWidget"; | 31 const char StatusAreaWidget::kNativeViewName[] = "StatusAreaWidget"; |
| 34 | 32 |
| 35 StatusAreaWidget::StatusAreaWidget(aura::Window* status_container) | 33 StatusAreaWidget::StatusAreaWidget(aura::Window* status_container) |
| 36 : status_area_widget_delegate_(new internal::StatusAreaWidgetDelegate), | 34 : status_area_widget_delegate_(new StatusAreaWidgetDelegate), |
| 37 overview_button_tray_(NULL), | 35 overview_button_tray_(NULL), |
| 38 system_tray_(NULL), | 36 system_tray_(NULL), |
| 39 web_notification_tray_(NULL), | 37 web_notification_tray_(NULL), |
| 40 #if defined(OS_CHROMEOS) | 38 #if defined(OS_CHROMEOS) |
| 41 logout_button_tray_(NULL), | 39 logout_button_tray_(NULL), |
| 42 virtual_keyboard_tray_(NULL), | 40 virtual_keyboard_tray_(NULL), |
| 43 #endif | 41 #endif |
| 44 login_status_(user::LOGGED_IN_NONE) { | 42 login_status_(user::LOGGED_IN_NONE) { |
| 45 views::Widget::InitParams params( | 43 views::Widget::InitParams params( |
| 46 views::Widget::InitParams::TYPE_WINDOW_FRAMELESS); | 44 views::Widget::InitParams::TYPE_WINDOW_FRAMELESS); |
| (...skipping 137 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 184 if (web_notification_tray_) | 182 if (web_notification_tray_) |
| 185 web_notification_tray_->UpdateAfterLoginStatusChange(login_status); | 183 web_notification_tray_->UpdateAfterLoginStatusChange(login_status); |
| 186 #if defined(OS_CHROMEOS) | 184 #if defined(OS_CHROMEOS) |
| 187 if (logout_button_tray_) | 185 if (logout_button_tray_) |
| 188 logout_button_tray_->UpdateAfterLoginStatusChange(login_status); | 186 logout_button_tray_->UpdateAfterLoginStatusChange(login_status); |
| 189 #endif | 187 #endif |
| 190 if (overview_button_tray_) | 188 if (overview_button_tray_) |
| 191 overview_button_tray_->UpdateAfterLoginStatusChange(login_status); | 189 overview_button_tray_->UpdateAfterLoginStatusChange(login_status); |
| 192 } | 190 } |
| 193 | 191 |
| 194 } // namespace internal | |
| 195 } // namespace ash | 192 } // namespace ash |
| OLD | NEW |