Shuffles and renames ash/common/wm classes

ash/common/wm/workspace/phantom_window_controller.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/workspace/phantom_window_controller.h"
 
 #include <math.h>
 
 #include "ash/common/shell_window_ids.h"
 #include "ash/common/wm/root_window_finder.h"
-#include "ash/common/wm/wm_lookup.h"
-#include "ash/common/wm/wm_root_window_controller.h"
-#include "ash/common/wm/wm_window.h"
+#include "ash/common/wm_lookup.h"
+#include "ash/common/wm_root_window_controller.h"
+#include "ash/common/wm_window.h"
 #include "grit/ash_resources.h"
 #include "ui/compositor/layer.h"
 #include "ui/compositor/scoped_layer_animation_settings.h"
 #include "ui/views/background.h"
 #include "ui/views/painter.h"
 #include "ui/views/view.h"
 #include "ui/views/widget/widget.h"
 
 namespace ash {
 namespace {
@@ skipping 30 matching lines @@
 }
 
 // Starts an animation of |widget| to |new_bounds_in_screen|. No-op if |widget|
 // is NULL.
 void AnimateToBounds(views::Widget* widget,
                      const gfx::Rect& new_bounds_in_screen) {
   if (!widget)
     return;
 
   ui::ScopedLayerAnimationSettings scoped_setter(
-      wm::WmLookup::Get()
-          ->GetWindowForWidget(widget)
-          ->GetLayer()
-          ->GetAnimator());
+      WmLookup::Get()->GetWindowForWidget(widget)->GetLayer()->GetAnimator());
   scoped_setter.SetTweenType(gfx::Tween::EASE_IN);
   scoped_setter.SetPreemptionStrategy(
       ui::LayerAnimator::IMMEDIATELY_ANIMATE_TO_NEW_TARGET);
   scoped_setter.SetTransitionDuration(
       base::TimeDelta::FromMilliseconds(kAnimationDurationMs));
   widget->SetBounds(new_bounds_in_screen);
 }
 
 }  // namespace
 
 // PhantomWindowController ----------------------------------------------------
 
-PhantomWindowController::PhantomWindowController(wm::WmWindow* window)
+PhantomWindowController::PhantomWindowController(WmWindow* window)
     : window_(window) {}
 
 PhantomWindowController::~PhantomWindowController() {}
 
 void PhantomWindowController::Show(const gfx::Rect& bounds_in_screen) {
   gfx::Rect adjusted_bounds_in_screen = GetAdjustedBounds(bounds_in_screen);
   if (adjusted_bounds_in_screen == target_bounds_in_screen_)
     return;
   target_bounds_in_screen_ = adjusted_bounds_in_screen;
 
   gfx::Rect start_bounds_in_screen = target_bounds_in_screen_;
   int start_width = std::max(
       kMinSizeWithShadow,
       static_cast<int>(start_bounds_in_screen.width() * kStartBoundsRatio));
   int start_height = std::max(
       kMinSizeWithShadow,
       static_cast<int>(start_bounds_in_screen.height() * kStartBoundsRatio));
   start_bounds_in_screen.Inset(
       floor((start_bounds_in_screen.width() - start_width) / 2.0f),
       floor((start_bounds_in_screen.height() - start_height) / 2.0f));
   phantom_widget_ =
       CreatePhantomWidget(wm::GetRootWindowMatching(target_bounds_in_screen_),
                           start_bounds_in_screen);
 
   AnimateToBounds(phantom_widget_.get(), target_bounds_in_screen_);
 }
 
 std::unique_ptr<views::Widget> PhantomWindowController::CreatePhantomWidget(
-    wm::WmWindow* root_window,
+    WmWindow* root_window,
     const gfx::Rect& bounds_in_screen) {
   std::unique_ptr<views::Widget> phantom_widget(new views::Widget);
   views::Widget::InitParams params(views::Widget::InitParams::TYPE_POPUP);
   params.opacity = views::Widget::InitParams::TRANSLUCENT_WINDOW;
   // PhantomWindowController is used by FrameMaximizeButton to highlight the
   // launcher button. Put the phantom in the same window as the launcher so that
   // the phantom is visible.
   params.keep_on_top = true;
   params.ownership = views::Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;
   params.name = "PhantomWindow";
   root_window->GetRootWindowController()->ConfigureWidgetInitParamsForContainer(
       phantom_widget.get(), kShellWindowId_ShelfContainer, &params);
   phantom_widget->set_focus_on_creation(false);
   phantom_widget->Init(params);
   phantom_widget->SetVisibilityChangedAnimationsEnabled(false);
-  wm::WmWindow* phantom_widget_window =
-      wm::WmLookup::Get()->GetWindowForWidget(phantom_widget.get());
+  WmWindow* phantom_widget_window =
+      WmLookup::Get()->GetWindowForWidget(phantom_widget.get());
   phantom_widget_window->SetShellWindowId(kShellWindowId_PhantomWindow);
   phantom_widget->SetBounds(bounds_in_screen);
   // TODO(sky): I suspect this is never true, verify that.
   if (phantom_widget_window->GetParent() == window_->GetParent()) {
     phantom_widget_window->GetParent()->StackChildAbove(phantom_widget_window,
                                                         window_);
   }
 
   const int kImages[] = IMAGE_GRID(IDR_AURA_PHANTOM_WINDOW);
   views::Painter* background_painter =
@@ skipping 11 matching lines @@
   widget_layer->SetOpacity(0);
   ui::ScopedLayerAnimationSettings scoped_setter(widget_layer->GetAnimator());
   scoped_setter.SetTransitionDuration(
       base::TimeDelta::FromMilliseconds(kAnimationDurationMs));
   widget_layer->SetOpacity(1);
 
   return phantom_widget;
 }
 
 }  // namespace ash