chromeos: Refactor shelf to create ShelfView earlier in startup

ash/shelf/wm_shelf.cc

 // Copyright 2016 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/shelf/wm_shelf.h"
 
 #include "ash/public/cpp/config.h"
 #include "ash/public/cpp/shelf_item_delegate.h"
 #include "ash/public/cpp/shell_window_ids.h"
 #include "ash/root_window_controller.h"
 #include "ash/session/session_controller.h"
 #include "ash/shelf/shelf_bezel_event_handler.h"
 #include "ash/shelf/shelf_controller.h"
 #include "ash/shelf/shelf_layout_manager.h"
-#include "ash/shelf/shelf_locking_manager.h"
 #include "ash/shelf/shelf_model.h"
 #include "ash/shelf/shelf_widget.h"
 #include "ash/shelf/wm_shelf_observer.h"
 #include "ash/shell.h"
 #include "ash/wm_window.h"
 #include "base/logging.h"
 #include "base/memory/ptr_util.h"
 #include "ui/display/types/display_constants.h"
 #include "ui/gfx/geometry/rect.h"
 
@@ skipping 31 matching lines @@
         event, static_cast<aura::Window*>(event->target()));
   }
 
  private:
   ShelfLayoutManager* shelf_layout_manager_;
   DISALLOW_COPY_AND_ASSIGN(AutoHideEventHandler);
 };
 
 // WmShelf ---------------------------------------------------------------------
 
-WmShelf::WmShelf() {}
+WmShelf::WmShelf() : shelf_locking_manager_(this) {
+  // TODO: ShelfBezelEventHandler needs to work with mus too.
+  // http://crbug.com/636647
+  if (Shell::GetAshConfig() != Config::MASH)
+    bezel_event_handler_ = base::MakeUnique<ShelfBezelEventHandler>(this);
+}
 
 WmShelf::~WmShelf() {}
 
 // static
 WmShelf* WmShelf::ForWindow(WmWindow* window) {
   return window->GetRootWindowController()->GetShelf();
 }
 
 // static
 bool WmShelf::CanChangeShelfAlignment() {
@@ skipping 32 matching lines @@
   DCHECK(!shelf_layout_manager_);
   shelf_layout_manager_ = shelf_widget_->shelf_layout_manager();
   shelf_layout_manager_->AddObserver(this);
 
   // Must occur after |shelf_widget_| is constructed because the system tray
   // constructors call back into WmShelf::shelf_widget().
   DCHECK(!shelf_widget_->status_area_widget());
   WmWindow* status_container =
       root->GetChildByShellWindowId(kShellWindowId_StatusContainer);
   shelf_widget_->CreateStatusAreaWidget(status_container);
-
-  // TODO: ShelfBezelEventHandler needs to work with mus too.
-  // http://crbug.com/636647
-  if (Shell::GetAshConfig() != Config::MASH)
-    bezel_event_handler_ = base::MakeUnique<ShelfBezelEventHandler>(this);
 }
 
 void WmShelf::ShutdownShelfWidget() {
   if (shelf_widget_)
     shelf_widget_->Shutdown();
 }
 
 void WmShelf::DestroyShelfWidget() {
   shelf_widget_.reset();
 }
 
-void WmShelf::CreateShelfView() {
+void WmShelf::NotifyShelfInitialized() {
   DCHECK(shelf_layout_manager_);
   DCHECK(shelf_widget_);
-  DCHECK(!shelf_view_);
-  shelf_view_ = shelf_widget_->CreateShelfView();
-  shelf_locking_manager_.reset(new ShelfLockingManager(this));
-  Shell::Get()->shelf_controller()->NotifyShelfCreated(this);
-}
-
-void WmShelf::ShutdownShelf() {
-  DCHECK(shelf_view_);
-  shelf_locking_manager_.reset();
-  shelf_view_ = nullptr;
-}
-
-bool WmShelf::IsShelfInitialized() const {
-  return !!shelf_view_;
+  Shell::Get()->shelf_controller()->NotifyShelfInitialized(this);
 }
 
 WmWindow* WmShelf::GetWindow() {
   return WmWindow::Get(shelf_widget_->GetNativeWindow());
 }
 
 void WmShelf::SetAlignment(ShelfAlignment alignment) {
   DCHECK(shelf_layout_manager_);
-  DCHECK(shelf_locking_manager_);
 
   if (alignment_ == alignment)
     return;
 
-  if (shelf_locking_manager_->is_locked() &&
+  if (shelf_locking_manager_.is_locked() &&
       alignment != SHELF_ALIGNMENT_BOTTOM_LOCKED) {
-    shelf_locking_manager_->set_stored_alignment(alignment);
+    shelf_locking_manager_.set_stored_alignment(alignment);
     return;
   }
 
   alignment_ = alignment;
   // The ShelfWidget notifies the ShelfView of the alignment change.
   shelf_widget_->OnShelfAlignmentChanged();
   shelf_layout_manager_->LayoutShelf();
   Shell::Get()->shelf_controller()->NotifyShelfAlignmentChanged(this);
   Shell::Get()->NotifyShelfAlignmentChanged(GetWindow()->GetRootWindow());
 }
@@ skipping 48 matching lines @@
 }
 
 void WmShelf::UpdateAutoHideState() {
   shelf_layout_manager_->UpdateAutoHideState();
 }
 
 ShelfBackgroundType WmShelf::GetBackgroundType() const {
   return shelf_widget_->GetBackgroundType();
 }
 
-bool WmShelf::IsVisible() const {
-  return shelf_widget_->IsShelfVisible();
-}
-
 void WmShelf::UpdateVisibilityState() {
   if (shelf_layout_manager_)
     shelf_layout_manager_->UpdateVisibilityState();
 }
 
 ShelfVisibilityState WmShelf::GetVisibilityState() const {
   return shelf_layout_manager_ ? shelf_layout_manager_->visibility_state()
                                : SHELF_HIDDEN;
 }
 
@@ skipping 75 matching lines @@
 
 StatusAreaWidget* WmShelf::GetStatusAreaWidget() const {
   return shelf_widget_->status_area_widget();
 }
 
 void WmShelf::SetVirtualKeyboardBoundsForTesting(const gfx::Rect& bounds) {
   shelf_layout_manager_->OnKeyboardBoundsChanging(bounds);
 }
 
 ShelfLockingManager* WmShelf::GetShelfLockingManagerForTesting() {
-  return shelf_locking_manager_.get();
+  return &shelf_locking_manager_;
 }
 
 ShelfView* WmShelf::GetShelfViewForTesting() {
-  return shelf_view_;
+  return shelf_widget_->shelf_view_for_testing();
 }
 
 void WmShelf::WillDeleteShelfLayoutManager() {
   if (Shell::GetAshConfig() == Config::MASH) {
     // TODO(sky): this should be removed once Shell is used everywhere.
     ShutdownShelfWidget();
   }
 
   // Clear event handlers that might forward events to the destroyed instance.
   auto_hide_event_handler_.reset();
@@ skipping 23 matching lines @@
 
 void WmShelf::OnBackgroundUpdated(ShelfBackgroundType background_type,
                                   AnimationChangeType change_type) {
   if (background_type == GetBackgroundType())
     return;
   for (auto& observer : observers_)
     observer.OnBackgroundTypeChanged(background_type, change_type);
 }
 
 }  // namespace ash