| 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 425 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 436 | 436 |
| 437 void RootWindowController::ShowShelf() { | 437 void RootWindowController::ShowShelf() { |
| 438 if (!shelf_->shelf()) | 438 if (!shelf_->shelf()) |
| 439 return; | 439 return; |
| 440 shelf_->shelf()->SetVisible(true); | 440 shelf_->shelf()->SetVisible(true); |
| 441 shelf_->status_area_widget()->Show(); | 441 shelf_->status_area_widget()->Show(); |
| 442 } | 442 } |
| 443 | 443 |
| 444 void RootWindowController::OnShelfCreated() { | 444 void RootWindowController::OnShelfCreated() { |
| 445 if (panel_layout_manager_) | 445 if (panel_layout_manager_) |
| 446 panel_layout_manager_->SetShelf(shelf_->shelf()); | 446 panel_layout_manager_->SetShelf(shelf_->shelf()->wm_shelf()); |
| 447 if (docked_layout_manager_) { | 447 if (docked_layout_manager_) { |
| 448 docked_layout_manager_->SetShelf(shelf_->shelf()->wm_shelf()); | 448 docked_layout_manager_->SetShelf(shelf_->shelf()->wm_shelf()); |
| 449 if (shelf_->shelf_layout_manager()) | 449 if (shelf_->shelf_layout_manager()) |
| 450 docked_layout_manager_->AddObserver(shelf_->shelf_layout_manager()); | 450 docked_layout_manager_->AddObserver(shelf_->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 | 456 |
| (...skipping 603 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1060 else | 1060 else |
| 1061 DisableTouchHudProjection(); | 1061 DisableTouchHudProjection(); |
| 1062 } | 1062 } |
| 1063 | 1063 |
| 1064 RootWindowController* GetRootWindowController( | 1064 RootWindowController* GetRootWindowController( |
| 1065 const aura::Window* root_window) { | 1065 const aura::Window* root_window) { |
| 1066 return root_window ? GetRootWindowSettings(root_window)->controller : NULL; | 1066 return root_window ? GetRootWindowSettings(root_window)->controller : NULL; |
| 1067 } | 1067 } |
| 1068 | 1068 |
| 1069 } // namespace ash | 1069 } // namespace ash |
| OLD | NEW |