Converts WmActivationObserver to aura::client::ActivationChangeObserver

ash/common/wm/panels/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/common/wm/panels/panel_layout_manager.h"
 
 #include <algorithm>
 #include <map>
 #include <utility>
 
 #include "ash/common/shelf/wm_shelf.h"
 #include "ash/common/shelf/wm_shelf_util.h"
 #include "ash/common/wm/overview/window_selector_controller.h"
 #include "ash/common/wm/window_animation_types.h"
 #include "ash/common/wm/window_parenting_utils.h"
 #include "ash/common/wm/window_state.h"
 #include "ash/common/wm_shell.h"
 #include "ash/common/wm_window.h"
 #include "ash/public/cpp/shell_window_ids.h"
 #include "ash/public/cpp/window_properties.h"
 #include "ash/root_window_controller.h"
+#include "ash/shell.h"
 #include "ash/wm/window_properties.h"
 #include "base/auto_reset.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "third_party/skia/include/core/SkPath.h"
 #include "ui/compositor/scoped_layer_animation_settings.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/geometry/vector2d.h"
 #include "ui/views/background.h"
 #include "ui/views/widget/widget.h"
+#include "ui/wm/public/activation_client.h"
 
 namespace ash {
 namespace {
 
 const int kPanelIdealSpacing = 4;
 
 const float kMaxHeightFactor = .80f;
 const float kMaxWidthFactor = .50f;
 
 // Duration for panel animations.
@@ skipping 200 matching lines @@
       root_window_controller_(panel_container->GetRootWindowController()),
       in_add_window_(false),
       in_layout_(false),
       show_callout_widgets_(true),
       dragged_panel_(NULL),
       shelf_(nullptr),
       last_active_panel_(NULL),
       weak_factory_(this) {
   DCHECK(panel_container);
   WmShell* shell = panel_container->GetShell();
-  shell->AddActivationObserver(this);
+  Shell::GetInstance()->activation_client()->AddObserver(this);
   shell->AddDisplayObserver(this);
   shell->AddShellObserver(this);
 }
 
 PanelLayoutManager::~PanelLayoutManager() {
   Shutdown();
 }
 
 // static
 PanelLayoutManager* PanelLayoutManager::Get(WmWindow* window) {
@@ skipping 10 matching lines @@
   if (shelf_) {
     shelf_->RemoveObserver(this);
     shelf_ = nullptr;
   }
   for (PanelList::iterator iter = panel_windows_.begin();
        iter != panel_windows_.end(); ++iter) {
     delete iter->callout_widget;
   }
   panel_windows_.clear();
   WmShell* shell = panel_container_->GetShell();
-  shell->RemoveActivationObserver(this);
+  Shell::GetInstance()->activation_client()->RemoveObserver(this);
   shell->RemoveDisplayObserver(this);
   shell->RemoveShellObserver(this);
 }
 
 void PanelLayoutManager::StartDragging(WmWindow* panel) {
   DCHECK(!dragged_panel_);
   dragged_panel_ = panel;
   Relayout();
 }
 
@@ skipping 187 matching lines @@
     return;
   }
 
   if (window_state->IsMinimized())
     MinimizePanel(window_state->window());
   else
     RestorePanel(window_state->window());
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-// PanelLayoutManager, WmActivationObserver implementation:
+// PanelLayoutManager, aura::client::ActivationChangeObserver implementation:
 
-void PanelLayoutManager::OnWindowActivated(WmWindow* gained_active,
-                                           WmWindow* lost_active) {
+void PanelLayoutManager::OnWindowActivated(ActivationReason reason,
+                                           aura::Window* gained_active,
+                                           aura::Window* lost_active) {
+  WmWindow* wm_gained_active = WmWindow::Get(gained_active);
   // Ignore if the panel that is not managed by this was activated.
-  if (gained_active && gained_active->GetType() == ui::wm::WINDOW_TYPE_PANEL &&
-      gained_active->GetParent() == panel_container_) {
-    UpdateStacking(gained_active);
+  if (wm_gained_active &&
+      wm_gained_active->GetType() == ui::wm::WINDOW_TYPE_PANEL &&
+      wm_gained_active->GetParent() == panel_container_) {
+    UpdateStacking(wm_gained_active);
     UpdateCallouts();
   }
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // PanelLayoutManager, WmDisplayObserver::Observer implementation:
 
 void PanelLayoutManager::OnDisplayConfigurationChanged() {
   Relayout();
 }
@@ skipping 411 matching lines @@
     }
   }
   // This bounds change will have caused a change to the Shelf which does not
   // propogate automatically to this class, so manually recalculate bounds.
   OnWindowResized();
 }
 
 void PanelLayoutManager::OnKeyboardClosed() {}
 
 }  // namespace ash