chromeos: Refactor shelf to create ShelfView earlier in startup

ash/shelf/shelf_widget.cc

 // Copyright 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/shelf/shelf_widget.h"
 
 #include "ash/animation/animation_change_type.h"
 #include "ash/focus_cycler.h"
 #include "ash/public/cpp/window_properties.h"
 #include "ash/root_window_controller.h"
@@ skipping 108 matching lines @@
 }
 
 void ShelfWidget::DelegateView::UpdateShelfBackground(SkColor color) {
   opaque_background_.SetColor(color);
 }
 
 ShelfWidget::ShelfWidget(WmWindow* shelf_container, WmShelf* wm_shelf)
     : wm_shelf_(wm_shelf),
       status_area_widget_(nullptr),
       delegate_view_(new DelegateView(this)),
-      shelf_view_(nullptr),
+      shelf_view_(new ShelfView(Shell::Get()->shelf_model(), wm_shelf_, this)),
       background_animator_(SHELF_BACKGROUND_DEFAULT,
                            wm_shelf_,
                            Shell::Get()->wallpaper_controller()),
       activating_as_fallback_(false) {
+  DCHECK(shelf_container);
   DCHECK(wm_shelf_);
-  background_animator_.AddObserver(this);
-  background_animator_.AddObserver(delegate_view_);
 
   views::Widget::InitParams params(
       views::Widget::InitParams::TYPE_WINDOW_FRAMELESS);
   params.name = "ShelfWidget";
   params.opacity = views::Widget::InitParams::TRANSLUCENT_WINDOW;
   params.ownership = views::Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;
   params.delegate = delegate_view_;
   shelf_container->GetRootWindowController()
       ->ConfigureWidgetInitParamsForContainer(
           this, shelf_container->aura_window()->id(), &params);
   Init(params);
 
   // The shelf should not take focus when initially shown.
   set_focus_on_creation(false);
   SetContentsView(delegate_view_);
   delegate_view_->SetParentLayer(GetLayer());
 
+  // The shelf view observes the shelf model and creates icons as items are
+  // added to the model.
+  shelf_view_->Init();
+  GetContentsView()->AddChildView(shelf_view_);
+
   shelf_layout_manager_ = new ShelfLayoutManager(this, wm_shelf_);
   shelf_layout_manager_->AddObserver(this);
   shelf_container->aura_window()->SetLayoutManager(shelf_layout_manager_);
   background_animator_.PaintBackground(
       shelf_layout_manager_->GetShelfBackgroundType(),
       AnimationChangeType::IMMEDIATE);
 
   views::Widget::AddObserver(this);
+
+  // Calls back into |this| and depends on |shelf_view_|.
+  background_animator_.AddObserver(this);
+  background_animator_.AddObserver(delegate_view_);
 }
 
 ShelfWidget::~ShelfWidget() {
   // Must call Shutdown() before destruction.
   DCHECK(!status_area_widget_);
+  background_animator_.RemoveObserver(delegate_view_);
+  background_animator_.RemoveObserver(this);
   Shell::Get()->focus_cycler()->RemoveWidget(this);
   SetFocusCycler(nullptr);
   RemoveObserver(this);
-  background_animator_.RemoveObserver(delegate_view_);
-  background_animator_.RemoveObserver(this);
 }
 
 void ShelfWidget::CreateStatusAreaWidget(WmWindow* status_container) {
   DCHECK(status_container);
   DCHECK(!status_area_widget_);
-  // TODO(jamescook): Move ownership to RootWindowController.
   status_area_widget_ = new StatusAreaWidget(status_container, wm_shelf_);
   status_area_widget_->CreateTrayViews();
+  // TODO(jamescook): Is the session check needed?

[msw, 2017/05/16 22:42:00]

nit: address now? (so many TODOs!)

[James Cook, 2017/05/17 16:16:12]

Ah, you never would have noticed if I hadn't added the line. :-)

Done. Wasn't needed, removed.

   if (Shell::Get()->session_controller()->IsActiveUserSessionStarted())
     status_area_widget_->Show();
   Shell::Get()->focus_cycler()->AddWidget(status_area_widget_);
   background_animator_.AddObserver(status_area_widget_);
   status_container->aura_window()->SetLayoutManager(
       new StatusAreaLayoutManager(this));
 }
 
 void ShelfWidget::SetPaintsBackground(ShelfBackgroundType background_type,
                                       AnimationChangeType change_type) {
@@ skipping 24 matching lines @@
 bool ShelfWidget::IsShelfHiddenBehindBlackBar() const {
   return delegate_view_->opaque_foreground()->GetTargetOpacity() != 0.0f;
 }
 
 void ShelfWidget::OnShelfAlignmentChanged() {
   shelf_view_->OnShelfAlignmentChanged();
   status_area_widget_->UpdateAfterShelfAlignmentChange();
   delegate_view_->SchedulePaint();
 }
 
-ShelfView* ShelfWidget::CreateShelfView() {
-  DCHECK(!shelf_view_);
-  shelf_view_ = new ShelfView(Shell::Get()->shelf_model(), wm_shelf_, this);
-  shelf_view_->Init();
-  GetContentsView()->AddChildView(shelf_view_);
-  return shelf_view_;
-}
-
 void ShelfWidget::PostCreateShelf() {
   SetFocusCycler(Shell::Get()->focus_cycler());
 
   // Ensure the newly created |shelf_| gets current values.
   background_animator_.NotifyObserver(this);
 
-  // TODO(jamescook): The IsActiveUserSessionStarted() check may not be needed
-  // because the shelf is only created after the first user session is active.
-  // The ShelfView seems to always be visible after login. At the lock screen
-  // the shelf is hidden because its container is hidden. During auto-hide it is
-  // hidden because ShelfWidget is transparent. Some of the ShelfView visibility
-  // code could be simplified. http://crbug.com/674773
-  // TODO(jdufualt|jamescook): Remove CHECK and shelf_view_->SetVisible call in
-  // m60 or beyond (see above TODO).
-  CHECK(Shell::Get()->session_controller()->IsActiveUserSessionStarted());
-  shelf_view_->SetVisible(
-      Shell::Get()->session_controller()->IsActiveUserSessionStarted());
   shelf_layout_manager_->LayoutShelf();
   shelf_layout_manager_->UpdateAutoHideState();
   Show();
 }
 
 bool ShelfWidget::IsShelfVisible() const {

[msw, 2017/05/16 22:42:00]

nit: remove? this will always return true now, right? (also, afaict, the only
caller is WmShelf::IsVisible, which isn't called, so that can also be removed?)

[James Cook, 2017/05/17 16:16:12]

Good catch! Removed.

-  return shelf_view_ && shelf_view_->visible();
+  return shelf_view_->visible();
 }
 
 bool ShelfWidget::IsShowingAppList() const {
   return GetAppListButton() && GetAppListButton()->is_showing_app_list();
 }
 
 bool ShelfWidget::IsShowingContextMenu() const {
-  return shelf_view_ && shelf_view_->IsShowingMenu();
+  return shelf_view_->IsShowingMenu();
 }
 
 bool ShelfWidget::IsShowingOverflowBubble() const {
-  return shelf_view_ && shelf_view_->IsShowingOverflowBubble();
+  return shelf_view_->IsShowingOverflowBubble();
 }
 
 void ShelfWidget::SetFocusCycler(FocusCycler* focus_cycler) {
   delegate_view_->set_focus_cycler(focus_cycler);
   if (focus_cycler)
     focus_cycler->AddWidget(this);
 }
 
 FocusCycler* ShelfWidget::GetFocusCycler() {
   return delegate_view_->focus_cycler();
@@ skipping 13 matching lines @@
     status_area_widget_->Shutdown();
     status_area_widget_ = nullptr;
   }
 
   CloseNow();
 }
 
 void ShelfWidget::UpdateIconPositionForPanel(WmWindow* panel) {
   ShelfID id =
       ShelfID::Deserialize(panel->aura_window()->GetProperty(kShelfIDKey));
-  if (!shelf_view_ || id.IsNull())
+  if (id.IsNull())
     return;
 
   WmWindow* shelf_window = WmWindow::Get(this->GetNativeWindow());
   shelf_view_->UpdatePanelIconPosition(
       id, shelf_window->ConvertRectFromScreen(panel->GetBoundsInScreen())
               .CenterPoint());
 }
 
 gfx::Rect ShelfWidget::GetScreenBoundsOfItemIconForWindow(WmWindow* window) {
   ShelfID id =
       ShelfID::Deserialize(window->aura_window()->GetProperty(kShelfIDKey));
-  // Window animations can be triggered during session restore before the shelf
-  // view is created. In that case, return default empty bounds.
-  if (!shelf_view_ || id.IsNull())
+  if (id.IsNull())
     return gfx::Rect();
 
   gfx::Rect bounds(shelf_view_->GetIdealBoundsOfItemIcon(id));
   gfx::Point screen_origin;
   views::View::ConvertPointToScreen(shelf_view_, &screen_origin);
   return gfx::Rect(screen_origin.x() + bounds.x(),
                    screen_origin.y() + bounds.y(), bounds.width(),
                    bounds.height());
 }
 
 AppListButton* ShelfWidget::GetAppListButton() const {
-  return shelf_view_ ? shelf_view_->GetAppListButton() : nullptr;
+  return shelf_view_->GetAppListButton();
 }
 
 app_list::ApplicationDragAndDropHost*
 ShelfWidget::GetDragAndDropHostForAppList() {
   return shelf_view_;
 }
 
 void ShelfWidget::OnWidgetActivationChanged(views::Widget* widget,
                                             bool active) {
   activating_as_fallback_ = false;
   if (active)
     delegate_view_->SetPaneFocusAndFocusDefault();
   else
     delegate_view_->GetFocusManager()->ClearFocus();
 }
 
 void ShelfWidget::UpdateShelfItemBackground(SkColor color) {
-  if (shelf_view_)
-    shelf_view_->UpdateShelfItemBackground(color);
+  shelf_view_->UpdateShelfItemBackground(color);
 }
 
 void ShelfWidget::WillDeleteShelfLayoutManager() {
   shelf_layout_manager_->RemoveObserver(this);
   shelf_layout_manager_ = nullptr;
 }
 
 }  // namespace ash