Move VisibilityController to corewm.

ash/shell.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/shell.h"
 
 #include <algorithm>
 #include <string>
 
 #include "ash/accelerators/focus_manager_factory.h"
@@ skipping 40 matching lines @@
 #include "ash/wm/screen_dimmer.h"
 #include "ash/wm/session_state_controller.h"
 #include "ash/wm/session_state_controller_impl.h"
 #include "ash/wm/session_state_controller_impl2.h"
 #include "ash/wm/stacking_controller.h"
 #include "ash/wm/system_gesture_event_filter.h"
 #include "ash/wm/system_modal_container_event_filter.h"
 #include "ash/wm/system_modal_container_layout_manager.h"
 #include "ash/wm/user_activity_detector.h"
 #include "ash/wm/video_detector.h"
-#include "ash/wm/visibility_controller.h"
+#include "ash/wm/window_animations.h"
 #include "ash/wm/window_cycle_controller.h"
 #include "ash/wm/window_modality_controller.h"
 #include "ash/wm/window_properties.h"
 #include "ash/wm/window_util.h"
 #include "ash/wm/workspace_controller.h"
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/debug/leak_annotations.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/client/stacking_client.h"
 #include "ui/aura/client/user_action_client.h"
 #include "ui/aura/env.h"
 #include "ui/aura/focus_manager.h"
 #include "ui/aura/layout_manager.h"
 #include "ui/aura/root_window.h"
 #include "ui/aura/ui_controls_aura.h"
 #include "ui/aura/window.h"
 #include "ui/compositor/layer.h"
 #include "ui/compositor/layer_animator.h"
 #include "ui/gfx/display.h"
 #include "ui/gfx/image/image_skia.h"
 #include "ui/gfx/screen.h"
 #include "ui/gfx/size.h"
 #include "ui/ui_controls/ui_controls.h"
 #include "ui/views/corewm/compound_event_filter.h"
 #include "ui/views/corewm/input_method_event_filter.h"
 #include "ui/views/corewm/shadow_controller.h"
+#include "ui/views/corewm/visibility_controller.h"
 #include "ui/views/focus/focus_manager_factory.h"
 #include "ui/views/widget/native_widget_aura.h"
 #include "ui/views/widget/widget.h"
 
 #if !defined(OS_MACOSX)
 #include "ash/accelerators/accelerator_controller.h"
 #include "ash/accelerators/accelerator_filter.h"
 #include "ash/accelerators/nested_dispatcher_controller.h"
 #endif
 
@@ skipping 48 matching lines @@
   virtual void OnWallpaperAnimationFinished() OVERRIDE {
   }
 
   virtual void OnWallpaperBootAnimationFinished() OVERRIDE {
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(DummyUserWallpaperDelegate);
 };
 
+// A Corewm VisibilityController subclass that calls the Ash animation routine
+// so we can pick up our extended animations. See ash/wm/window_animations.h.
+class AshVisibilityController : public views::corewm::VisibilityController {
+ public:
+  AshVisibilityController() {}
+  virtual ~AshVisibilityController() {}
+
+ private:
+  // Overridden from views::corewm::VisibilityController:
+  virtual bool CallAnimateOnChildWindowVisibilityChanged(
+      aura::Window* window,
+      bool visible) OVERRIDE {
+    return AnimateOnChildWindowVisibilityChanged(window, visible);
+  }
+
+  DISALLOW_COPY_AND_ASSIGN(AshVisibilityController);
+};
+
 }  // namespace
 
 // static
 Shell* Shell::instance_ = NULL;
 // static
 bool Shell::initially_hide_cursor_ = false;
 
 ////////////////////////////////////////////////////////////////////////////////
 // Shell::TestApi
 
@@ skipping 312 matching lines @@
 
   mouse_cursor_filter_.reset(new internal::MouseCursorEventFilter());
   AddPreTargetHandler(mouse_cursor_filter_.get());
 
   // Create Controllers that may need root window.
   // TODO(oshima): Move as many controllers before creating
   // RootWindowController as possible.
   stacking_client_.reset(delegate_->CreateStackingClient());
   if (stacking_client_.get())
     aura::client::SetStackingClient(stacking_client_.get());
-  visibility_controller_.reset(new internal::VisibilityController);
+  visibility_controller_.reset(new AshVisibilityController);
   drag_drop_controller_.reset(new internal::DragDropController);
   user_action_client_.reset(delegate_->CreateUserActionClient());
   window_modality_controller_.reset(new internal::WindowModalityController);
   AddPreTargetHandler(window_modality_controller_.get());
 
   magnification_controller_.reset(
       MagnificationController::CreateInstance());
 
   partial_magnification_controller_.reset(
       new PartialMagnificationController());
@@ skipping 363 matching lines @@
 
 bool Shell::CanAcceptEvents() {
   return true;
 }
 
 ui::EventTarget* Shell::GetParentTarget() {
   return NULL;
 }
 
 }  // namespace ash