| 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/root_window_controller.h" | 5 #include "ash/root_window_controller.h" |
| 6 | 6 |
| 7 #include <queue> | 7 #include <queue> |
| 8 #include <vector> | 8 #include <vector> |
| 9 | 9 |
| 10 #include "ash/ash_constants.h" | 10 #include "ash/ash_constants.h" |
| (...skipping 438 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 449 docked_layout_manager_->AddObserver( | 449 docked_layout_manager_->AddObserver( |
| 450 shelf_widget_->shelf_layout_manager()); | 450 shelf_widget_->shelf_layout_manager()); |
| 451 } | 451 } |
| 452 | 452 |
| 453 // Notify shell observers that the shelf has been created. | 453 // Notify shell observers that the shelf has been created. |
| 454 Shell::GetInstance()->OnShelfCreatedForRootWindow(GetRootWindow()); | 454 Shell::GetInstance()->OnShelfCreatedForRootWindow(GetRootWindow()); |
| 455 | 455 |
| 456 shelf_widget_->PostCreateShelf(); | 456 shelf_widget_->PostCreateShelf(); |
| 457 } | 457 } |
| 458 | 458 |
| 459 Shelf* RootWindowController::GetShelf() const { |
| 460 // TODO(jamescook): Shelf should be owned by this class, not by ShelfWidget. |
| 461 return shelf_widget_->shelf(); |
| 462 } |
| 463 |
| 459 void RootWindowController::UpdateAfterLoginStatusChange( | 464 void RootWindowController::UpdateAfterLoginStatusChange( |
| 460 user::LoginStatus status) { | 465 user::LoginStatus status) { |
| 461 if (status != user::LOGGED_IN_NONE) | 466 if (status != user::LOGGED_IN_NONE) |
| 462 mouse_event_target_.reset(); | 467 mouse_event_target_.reset(); |
| 463 if (shelf_widget_->status_area_widget()) | 468 if (shelf_widget_->status_area_widget()) |
| 464 shelf_widget_->status_area_widget()->UpdateAfterLoginStatusChange(status); | 469 shelf_widget_->status_area_widget()->UpdateAfterLoginStatusChange(status); |
| 465 } | 470 } |
| 466 | 471 |
| 467 void RootWindowController::HandleInitialDesktopBackgroundAnimationStarted() { | 472 void RootWindowController::HandleInitialDesktopBackgroundAnimationStarted() { |
| 468 #if defined(OS_CHROMEOS) | 473 #if defined(OS_CHROMEOS) |
| (...skipping 614 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1083 aura::Window* primary_root_window = Shell::GetInstance() | 1088 aura::Window* primary_root_window = Shell::GetInstance() |
| 1084 ->window_tree_host_manager() | 1089 ->window_tree_host_manager() |
| 1085 ->GetPrimaryRootWindow(); | 1090 ->GetPrimaryRootWindow(); |
| 1086 return GetRootWindowSettings(primary_root_window)->controller; | 1091 return GetRootWindowSettings(primary_root_window)->controller; |
| 1087 } | 1092 } |
| 1088 | 1093 |
| 1089 return GetRootWindowSettings(root_window)->controller; | 1094 return GetRootWindowSettings(root_window)->controller; |
| 1090 } | 1095 } |
| 1091 | 1096 |
| 1092 } // namespace ash | 1097 } // namespace ash |
| OLD | NEW |