| 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 145 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 156 virtual_keyboard_tray_ = new VirtualKeyboardTray(this); | 156 virtual_keyboard_tray_ = new VirtualKeyboardTray(this); |
| 157 status_area_widget_delegate_->AddTray(virtual_keyboard_tray_); | 157 status_area_widget_delegate_->AddTray(virtual_keyboard_tray_); |
| 158 } | 158 } |
| 159 #endif | 159 #endif |
| 160 | 160 |
| 161 void StatusAreaWidget::AddOverviewButtonTray() { | 161 void StatusAreaWidget::AddOverviewButtonTray() { |
| 162 overview_button_tray_ = new OverviewButtonTray(this); | 162 overview_button_tray_ = new OverviewButtonTray(this); |
| 163 status_area_widget_delegate_->AddTray(overview_button_tray_); | 163 status_area_widget_delegate_->AddTray(overview_button_tray_); |
| 164 } | 164 } |
| 165 | 165 |
| 166 void StatusAreaWidget::SetShelfAlignment(ShelfAlignment alignment) { | 166 void StatusAreaWidget::SetShelfAlignment(wm::ShelfAlignment alignment) { |
| 167 status_area_widget_delegate_->set_alignment(alignment); | 167 status_area_widget_delegate_->set_alignment(alignment); |
| 168 if (system_tray_) | 168 if (system_tray_) |
| 169 system_tray_->SetShelfAlignment(alignment); | 169 system_tray_->SetShelfAlignment(alignment); |
| 170 if (web_notification_tray_) | 170 if (web_notification_tray_) |
| 171 web_notification_tray_->SetShelfAlignment(alignment); | 171 web_notification_tray_->SetShelfAlignment(alignment); |
| 172 #if defined(OS_CHROMEOS) | 172 #if defined(OS_CHROMEOS) |
| 173 if (logout_button_tray_) | 173 if (logout_button_tray_) |
| 174 logout_button_tray_->SetShelfAlignment(alignment); | 174 logout_button_tray_->SetShelfAlignment(alignment); |
| 175 if (virtual_keyboard_tray_) | 175 if (virtual_keyboard_tray_) |
| 176 virtual_keyboard_tray_->SetShelfAlignment(alignment); | 176 virtual_keyboard_tray_->SetShelfAlignment(alignment); |
| (...skipping 19 matching lines...) Expand all Loading... |
| 196 web_notification_tray_->UpdateAfterLoginStatusChange(login_status); | 196 web_notification_tray_->UpdateAfterLoginStatusChange(login_status); |
| 197 #if defined(OS_CHROMEOS) | 197 #if defined(OS_CHROMEOS) |
| 198 if (logout_button_tray_) | 198 if (logout_button_tray_) |
| 199 logout_button_tray_->UpdateAfterLoginStatusChange(login_status); | 199 logout_button_tray_->UpdateAfterLoginStatusChange(login_status); |
| 200 #endif | 200 #endif |
| 201 if (overview_button_tray_) | 201 if (overview_button_tray_) |
| 202 overview_button_tray_->UpdateAfterLoginStatusChange(login_status); | 202 overview_button_tray_->UpdateAfterLoginStatusChange(login_status); |
| 203 } | 203 } |
| 204 | 204 |
| 205 } // namespace ash | 205 } // namespace ash |
| OLD | NEW |