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

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/ash_switches.h"
 #include "ash/focus_cycler.h"
-#include "ash/root_window_controller.h"
 #include "ash/session/session_state_delegate.h"
 #include "ash/shelf/shelf_constants.h"
 #include "ash/shelf/shelf_delegate.h"
 #include "ash/shelf/shelf_layout_manager.h"
 #include "ash/shelf/shelf_model.h"
 #include "ash/shelf/shelf_navigator.h"
 #include "ash/shelf/shelf_util.h"
 #include "ash/shelf/shelf_view.h"
 #include "ash/shelf/shelf_widget.h"
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
 #include "ash/system/tray/system_tray_delegate.h"
+#include "ash/wm/aura/wm_window_aura.h"
 #include "ash/wm/common/shelf/wm_shelf_constants.h"
 #include "ash/wm/common/shelf/wm_shelf_util.h"
+#include "ash/wm/common/wm_root_window_controller.h"
 #include "ash/wm/status_area_layout_manager.h"
 #include "ash/wm/window_properties.h"
 #include "ash/wm/workspace_controller.h"
 #include "grit/ash_resources.h"
 #include "grit/ash_wm_common_resources.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_event_dispatcher.h"
 #include "ui/aura/window_observer.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/compositor/layer.h"
@@ skipping 516 matching lines @@
   if (GetDimmed())
     return dimmer_view_->GetBoundsInScreen();
   return gfx::Rect();
 }
 
 void ShelfWidget::DelegateView::UpdateBackground(int alpha) {
   alpha_ = alpha;
   SchedulePaint();
 }
 
-ShelfWidget::ShelfWidget(aura::Window* shelf_container,
-                         aura::Window* status_container,
+ShelfWidget::ShelfWidget(wm::WmWindow* wm_shelf_container,
+                         wm::WmWindow* wm_status_container,
                          WorkspaceController* workspace_controller)
     : delegate_view_(new DelegateView(this)),
       background_animator_(delegate_view_, 0, wm::kShelfBackgroundAlpha),
-      activating_as_fallback_(false),
-      window_container_(shelf_container) {
+      activating_as_fallback_(false) {
   views::Widget::InitParams params(
       views::Widget::InitParams::TYPE_WINDOW_FRAMELESS);
   params.opacity = views::Widget::InitParams::TRANSLUCENT_WINDOW;
   params.ownership = views::Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;
-  params.parent = shelf_container;
   params.delegate = delegate_view_;
+  wm_shelf_container->GetRootWindowController()
+      ->ConfigureWidgetInitParamsForContainer(
+          this, wm_shelf_container->GetShellWindowId(), &params);
   Init(params);
 
   // The shelf should not take focus when initially shown.
   set_focus_on_creation(false);
   SetContentsView(delegate_view_);
   delegate_view_->SetParentLayer(GetLayer());
 
   shelf_layout_manager_ = new ShelfLayoutManager(this);
   shelf_layout_manager_->AddObserver(this);
+  aura::Window* shelf_container =
+      wm::WmWindowAura::GetAuraWindow(wm_shelf_container);
   shelf_container->SetLayoutManager(shelf_layout_manager_);
   shelf_layout_manager_->set_workspace_controller(workspace_controller);
   workspace_controller->SetShelf(shelf_layout_manager_);
 
-  status_area_widget_ = new StatusAreaWidget(status_container, this);
+  status_area_widget_ = new StatusAreaWidget(wm_status_container, this);
   status_area_widget_->CreateTrayViews();
   if (Shell::GetInstance()->session_state_delegate()->
           IsActiveUserSessionStarted()) {
     status_area_widget_->Show();
   }
   Shell::GetInstance()->focus_cycler()->AddWidget(status_area_widget_);
 
+  aura::Window* status_container =
+      wm::WmWindowAura::GetAuraWindow(wm_status_container);
   status_container->SetLayoutManager(
       new StatusAreaLayoutManager(status_container, this));
 
   shelf_container->SetEventTargeter(std::unique_ptr<ui::EventTargeter>(
       new ShelfWindowTargeter(shelf_container, shelf_layout_manager_)));
   status_container->SetEventTargeter(std::unique_ptr<ui::EventTargeter>(
       new ShelfWindowTargeter(status_container, shelf_layout_manager_)));
 
   views::Widget::AddObserver(this);
 }
@@ skipping 103 matching lines @@
   if (shelf_)
     shelf_->SchedulePaint();
   status_area_widget_->SchedulePaint();
 }
 
 bool ShelfWidget::GetDimsShelf() const {
   return delegate_view_->GetDimmed();
 }
 
 void ShelfWidget::CreateShelf() {
-  if (shelf_)
-    return;
+  DCHECK(!shelf_);
 
   Shell* shell = Shell::GetInstance();
   ShelfDelegate* delegate = shell->GetShelfDelegate();
   shelf_.reset(new Shelf(shell->shelf_model(), delegate, this));
   delegate->OnShelfCreated(shelf_.get());
 
   SetFocusCycler(shell->focus_cycler());
+}
 
-  // Inform the root window controller.
-  RootWindowController::ForWindow(window_container_)->OnShelfCreated();
-
-  shelf_->SetVisible(
-      shell->session_state_delegate()->IsActiveUserSessionStarted());
+void ShelfWidget::PostCreateShelf() {

[James Cook, 2016/05/26 22:16:56]

This method is unfortunate, but I need it to preserve the ordering of observer
notifications between the RootWindowController and ShelfLayoutManager.

(The shelf code is a mess. I have a diagram on my whiteboard if you're morbidly
curious.)

+  shelf_->SetVisible(Shell::GetInstance()
+                         ->session_state_delegate()
+                         ->IsActiveUserSessionStarted());
   shelf_layout_manager_->LayoutShelf();
   shelf_layout_manager_->UpdateAutoHideState();
   Show();
 }
 
 bool ShelfWidget::IsShelfVisible() const {
   return shelf_.get() && shelf_->IsVisible();
 }
 
 void ShelfWidget::SetShelfVisibility(bool visible) {
@@ skipping 67 matching lines @@
     shelf_layout_manager_->UpdateAutoHideForMouseEvent(event);
 }
 
 void ShelfWidget::OnGestureEvent(ui::GestureEvent* event) {
   Widget::OnGestureEvent(event);
   if (Shell::GetInstance()->in_mus() && shelf_layout_manager_)
     shelf_layout_manager_->UpdateAutoHideForGestureEvent(event);
 }
 
 }  // namespace ash