Refactor: Shelf Widget

ash/wm/panel_layout_manager.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/wm/panel_layout_manager.h"
 
 #include <algorithm>
 #include <map>
 
 #include "ash/launcher/launcher.h"
 #include "ash/screen_ash.h"
+#include "ash/shelf/shelf_widget.h"
 #include "ash/shell.h"
 #include "ash/wm/frame_painter.h"
 #include "ash/wm/property_util.h"
 #include "ash/wm/window_animations.h"
 #include "ash/wm/window_util.h"
 #include "base/auto_reset.h"
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "third_party/skia/include/core/SkPaint.h"
@@ skipping 101 matching lines @@
 ////////////////////////////////////////////////////////////////////////////////
 // PanelLayoutManager public implementation:
 PanelLayoutManager::PanelLayoutManager(aura::Window* panel_container)
     : panel_container_(panel_container),
       in_layout_(false),
       dragged_panel_(NULL),
       launcher_(NULL),
       last_active_panel_(NULL),
       weak_factory_(this) {
   DCHECK(panel_container);
-  aura::client::GetActivationClient(Shell::GetPrimaryRootWindow())->
+  aura::client::GetActivationClient(panel_container_->GetRootWindow())->

[James Cook, 2013/03/05 20:30:38]

Is this part of the same patch? It looks OK but I'm not sure if it's related?

[Harry McCleave, 2013/03/06 01:59:49]

Done.

       AddObserver(this);
 }
 
 PanelLayoutManager::~PanelLayoutManager() {
   Shutdown();
-  if (launcher_)
-    launcher_->RemoveIconObserver(this);
   aura::client::GetActivationClient(Shell::GetPrimaryRootWindow())->
       RemoveObserver(this);
 }
 
 void PanelLayoutManager::Shutdown() {
   for (PanelList::iterator iter = panel_windows_.begin();
        iter != panel_windows_.end(); ++iter) {
     delete iter->callout_widget;
   }
   panel_windows_.clear();
+  if (launcher_)
+    launcher_->RemoveIconObserver(this);
+  launcher_ = NULL;
 }
 
 void PanelLayoutManager::StartDragging(aura::Window* panel) {
   DCHECK(!dragged_panel_);
   DCHECK(panel->parent() == panel_container_);
   dragged_panel_ = panel;
   Relayout();
 }
 
 void PanelLayoutManager::FinishDragging() {
@@ skipping 154 matching lines @@
     wm::DeactivateWindow(panel);
   Relayout();
 }
 
 void PanelLayoutManager::RestorePanel(aura::Window* panel) {
   panel->Show();
   Relayout();
 }
 
 void PanelLayoutManager::Relayout() {
-  if (!launcher_ || !launcher_->widget())
+  if (!launcher_ || !launcher_->shelf_widget())
     return;
 
   if (in_layout_)
     return;
   base::AutoReset<bool> auto_reset_in_layout(&in_layout_, true);
 
-  int launcher_top = launcher_->widget()->GetWindowBoundsInScreen().y();
+  int launcher_top = launcher_->shelf_widget()->GetWindowBoundsInScreen().y();
   int panel_left_bounds = kPanelIdealSpacing;
   int panel_right_bounds =
       panel_container_->bounds().width() - kPanelIdealSpacing;
   aura::Window* active_panel = NULL;
   std::vector<VisiblePanelPositionInfo> visible_panels;
   for (PanelList::iterator iter = panel_windows_.begin();
        iter != panel_windows_.end(); ++iter) {
     aura::Window* panel = iter->window;
     if (!panel->IsVisible() || panel == dragged_panel_)
       continue;
@@ skipping 153 matching lines @@
   DCHECK_EQ(callout_widget->GetNativeView()->GetRootWindow(),
             panel_container_->GetRootWindow());
   views::View* content_view = new views::View;
   content_view->set_background(new CalloutWidgetBackground);
   callout_widget->SetContentsView(content_view);
   return callout_widget;
 }
 
 }  // namespace internal
 }  // namespace ash