| 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/aura/aura_layout_manager_adapter.h" | 10 #include "ash/aura/aura_layout_manager_adapter.h" |
| (...skipping 478 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 489 void RootWindowController::ShowShelf() { | 489 void RootWindowController::ShowShelf() { |
| 490 if (!shelf_widget_->shelf()) | 490 if (!shelf_widget_->shelf()) |
| 491 return; | 491 return; |
| 492 shelf_widget_->shelf()->SetVisible(true); | 492 shelf_widget_->shelf()->SetVisible(true); |
| 493 shelf_widget_->status_area_widget()->Show(); | 493 shelf_widget_->status_area_widget()->Show(); |
| 494 } | 494 } |
| 495 | 495 |
| 496 void RootWindowController::CreateShelf() { | 496 void RootWindowController::CreateShelf() { |
| 497 if (shelf_widget_->shelf()) | 497 if (shelf_widget_->shelf()) |
| 498 return; | 498 return; |
| 499 shelf_widget_->CreateShelf(wm_shelf_aura_.get()); | 499 shelf_widget_->CreateShelf(); |
| 500 | 500 |
| 501 if (panel_layout_manager_) | 501 if (panel_layout_manager_) |
| 502 panel_layout_manager_->SetShelf(wm_shelf_aura_.get()); | 502 panel_layout_manager_->SetShelf(wm_shelf_aura_.get()); |
| 503 if (docked_layout_manager_) { | 503 if (docked_layout_manager_) { |
| 504 docked_layout_manager_->SetShelf(wm_shelf_aura_.get()); | 504 docked_layout_manager_->SetShelf(wm_shelf_aura_.get()); |
| 505 if (shelf_widget_->shelf_layout_manager()) | 505 if (shelf_widget_->shelf_layout_manager()) |
| 506 docked_layout_manager_->AddObserver( | 506 docked_layout_manager_->AddObserver( |
| 507 shelf_widget_->shelf_layout_manager()); | 507 shelf_widget_->shelf_layout_manager()); |
| 508 } | 508 } |
| 509 | 509 |
| (...skipping 468 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 978 aura::Window* primary_root_window = Shell::GetInstance() | 978 aura::Window* primary_root_window = Shell::GetInstance() |
| 979 ->window_tree_host_manager() | 979 ->window_tree_host_manager() |
| 980 ->GetPrimaryRootWindow(); | 980 ->GetPrimaryRootWindow(); |
| 981 return GetRootWindowSettings(primary_root_window)->controller; | 981 return GetRootWindowSettings(primary_root_window)->controller; |
| 982 } | 982 } |
| 983 | 983 |
| 984 return GetRootWindowSettings(root_window)->controller; | 984 return GetRootWindowSettings(root_window)->controller; |
| 985 } | 985 } |
| 986 | 986 |
| 987 } // namespace ash | 987 } // namespace ash |
| OLD | NEW |