Chromium Code Reviews| Index: ash/root_window_controller.cc |
| diff --git a/ash/root_window_controller.cc b/ash/root_window_controller.cc |
| index ed933609b43bce42fd7c190b599a4a492af24cf6..758509853be1fd97559556babc32a4f503cbb772 100644 |
| --- a/ash/root_window_controller.cc |
| +++ b/ash/root_window_controller.cc |
| @@ -355,11 +355,13 @@ WmShelf* RootWindowController::GetShelf() { |
| return wm_shelf_.get(); |
| } |
| -void RootWindowController::CreateShelf() { |
| +void RootWindowController::CreateShelfView() { |
| if (wm_shelf_->IsShelfInitialized()) |
| return; |
| - wm_shelf_->InitializeShelf(); |
| + wm_shelf_->CreateShelfView(); |
| + // TODO(jamescook): Pass |wm_shelf_| into the constructors for these layout |
|
msw
2017/01/19 09:54:26
aside: maybe, unless they depend on the shelf view
James Cook
2017/01/19 17:31:34
Yeah, that's why I didn't do it here. The SetShelf
|
| + // managers. |
| if (panel_layout_manager_) |
| panel_layout_manager_->SetShelf(wm_shelf_.get()); |
| if (docked_window_layout_manager_) { |
| @@ -800,7 +802,7 @@ void RootWindowController::Init(RootWindowType root_window_type) { |
| // Create a shelf if a user is already logged in. |
| if (wm_shell->GetSessionStateDelegate()->NumberOfLoggedInUsers()) |
| - CreateShelf(); |
| + CreateShelfView(); |
| // Notify shell observers about new root window. |
| shell->OnRootWindowAdded(WmWindow::Get(root_window)); |