| 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/public/cpp/config.h" | 7 #include "ash/public/cpp/config.h" |
| 8 #include "ash/public/cpp/shell_window_ids.h" | 8 #include "ash/public/cpp/shell_window_ids.h" |
| 9 #include "ash/root_window_controller.h" | 9 #include "ash/root_window_controller.h" |
| 10 #include "ash/session/session_controller.h" | 10 #include "ash/session/session_controller.h" |
| (...skipping 183 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 194 overview_button_tray_->UpdateShelfItemBackground(color); | 194 overview_button_tray_->UpdateShelfItemBackground(color); |
| 195 } | 195 } |
| 196 | 196 |
| 197 void StatusAreaWidget::AddSystemTray() { | 197 void StatusAreaWidget::AddSystemTray() { |
| 198 system_tray_ = new SystemTray(wm_shelf_); | 198 system_tray_ = new SystemTray(wm_shelf_); |
| 199 status_area_widget_delegate_->AddTray(system_tray_); | 199 status_area_widget_delegate_->AddTray(system_tray_); |
| 200 } | 200 } |
| 201 | 201 |
| 202 void StatusAreaWidget::AddWebNotificationTray() { | 202 void StatusAreaWidget::AddWebNotificationTray() { |
| 203 DCHECK(system_tray_); | 203 DCHECK(system_tray_); |
| 204 web_notification_tray_ = new WebNotificationTray( | 204 web_notification_tray_ = |
| 205 wm_shelf_, WmWindow::Get(this->GetNativeWindow()), system_tray_); | 205 new WebNotificationTray(wm_shelf_, GetNativeWindow(), system_tray_); |
| 206 status_area_widget_delegate_->AddTray(web_notification_tray_); | 206 status_area_widget_delegate_->AddTray(web_notification_tray_); |
| 207 } | 207 } |
| 208 | 208 |
| 209 void StatusAreaWidget::AddLockScreenActionTray() { | 209 void StatusAreaWidget::AddLockScreenActionTray() { |
| 210 DCHECK(system_tray_); | 210 DCHECK(system_tray_); |
| 211 lock_screen_action_tray_ = new LockScreenActionTray(wm_shelf_); | 211 lock_screen_action_tray_ = new LockScreenActionTray(wm_shelf_); |
| 212 status_area_widget_delegate_->AddTray(lock_screen_action_tray_); | 212 status_area_widget_delegate_->AddTray(lock_screen_action_tray_); |
| 213 } | 213 } |
| 214 | 214 |
| 215 void StatusAreaWidget::AddLogoutButtonTray() { | 215 void StatusAreaWidget::AddLogoutButtonTray() { |
| (...skipping 15 matching lines...) Expand all Loading... |
| 231 ime_menu_tray_ = new ImeMenuTray(wm_shelf_); | 231 ime_menu_tray_ = new ImeMenuTray(wm_shelf_); |
| 232 status_area_widget_delegate_->AddTray(ime_menu_tray_); | 232 status_area_widget_delegate_->AddTray(ime_menu_tray_); |
| 233 } | 233 } |
| 234 | 234 |
| 235 void StatusAreaWidget::AddOverviewButtonTray() { | 235 void StatusAreaWidget::AddOverviewButtonTray() { |
| 236 overview_button_tray_ = new OverviewButtonTray(wm_shelf_); | 236 overview_button_tray_ = new OverviewButtonTray(wm_shelf_); |
| 237 status_area_widget_delegate_->AddTray(overview_button_tray_); | 237 status_area_widget_delegate_->AddTray(overview_button_tray_); |
| 238 } | 238 } |
| 239 | 239 |
| 240 } // namespace ash | 240 } // namespace ash |
| OLD | NEW |