mash: Convert shelf to wm::WmWindow types, part 1

ash/root_window_controller.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/root_window_controller.h"
 
 #include <queue>
 #include <vector>
 
 #include "ash/ash_constants.h"
@@ skipping 418 matching lines @@
   return ash_host_->AsWindowTreeHost()->window()->GetChildById(container_id);
 }
 
 void RootWindowController::ShowShelf() {
   if (!shelf_widget_->shelf())
     return;
   shelf_widget_->shelf()->SetVisible(true);
   shelf_widget_->status_area_widget()->Show();
 }
 
-void RootWindowController::OnShelfCreated() {
+void RootWindowController::CreateShelf() {
+  if (shelf_widget_->shelf())
+    return;
+  shelf_widget_->CreateShelf();
+
   if (panel_layout_manager_)
     panel_layout_manager_->SetShelf(shelf_widget_->shelf()->wm_shelf());
   if (docked_layout_manager_) {
     docked_layout_manager_->SetShelf(shelf_widget_->shelf()->wm_shelf());
     if (shelf_widget_->shelf_layout_manager())
       docked_layout_manager_->AddObserver(
           shelf_widget_->shelf_layout_manager());
   }
 
   // Notify shell observers that the shelf has been created.
   Shell::GetInstance()->OnShelfCreatedForRootWindow(GetRootWindow());
+
+  shelf_widget_->PostCreateShelf();
 }
 
 void RootWindowController::UpdateAfterLoginStatusChange(
     user::LoginStatus status) {
   if (status != user::LOGGED_IN_NONE)
     mouse_event_target_.reset();
   if (shelf_widget_->status_area_widget())
     shelf_widget_->status_area_widget()->UpdateAfterLoginStatusChange(status);
 }
 
@@ skipping 254 matching lines @@
 
   if (root_window_type == PRIMARY) {
     root_window_layout()->OnWindowResized();
     shell->InitKeyboard();
   } else {
     root_window_layout()->OnWindowResized();
     ash_host_->AsWindowTreeHost()->Show();
 
     // Create a shelf if a user is already logged in.
     if (shell->session_state_delegate()->NumberOfLoggedInUsers())
-      shelf_widget()->CreateShelf();
+      CreateShelf();
 
     // Notify shell observers about new root window.
     shell->OnRootWindowAdded(root_window);
   }
 
 #if defined(OS_CHROMEOS)
   if (!base::CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kAshDisableTouchExplorationMode)) {
     touch_exploration_manager_.reset(new AshTouchExplorationManager(this));
   }
@@ skipping 13 matching lines @@
       new WorkspaceLayoutManagerDelegateImpl(root_window);
   workspace_controller_.reset(new WorkspaceController(
       default_container, base::WrapUnique(workspace_layout_manager_delegate)));
 
   wm::WmWindow* always_on_top_container =
       wm::WmWindowAura::Get(GetContainer(kShellWindowId_AlwaysOnTopContainer));
   always_on_top_controller_.reset(
       new AlwaysOnTopController(always_on_top_container));
 
   DCHECK(!shelf_widget_.get());
-  aura::Window* shelf_container = GetContainer(kShellWindowId_ShelfContainer);
-  // TODO(harrym): Remove when status area is view.
-  aura::Window* status_container = GetContainer(kShellWindowId_StatusContainer);
+  wm::WmWindow* shelf_container =
+      wm::WmWindowAura::Get(GetContainer(kShellWindowId_ShelfContainer));
+  wm::WmWindow* status_container =
+      wm::WmWindowAura::Get(GetContainer(kShellWindowId_StatusContainer));
   shelf_widget_.reset(new ShelfWidget(shelf_container, status_container,
                                       workspace_controller()));
   workspace_layout_manager_delegate->set_shelf(
       shelf_widget_->shelf_layout_manager());
 
   if (!Shell::GetInstance()->session_state_delegate()->
       IsActiveUserSessionStarted()) {
     // This window exists only to be a event target on login screen.
     // It does not have to handle events, nor be visible.
     mouse_event_target_.reset(new aura::Window(new EmptyWindowDelegate));
@@ skipping 304 matching lines @@
     aura::Window* primary_root_window = Shell::GetInstance()
                                             ->window_tree_host_manager()
                                             ->GetPrimaryRootWindow();
     return GetRootWindowSettings(primary_root_window)->controller;
   }
 
   return GetRootWindowSettings(root_window)->controller;
 }
 
 }  // namespace ash