Moves ash/wm/common/resources back to ash

ash/wm/common/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/wm/common/workspace/phantom_window_controller.h"
 
 #include <math.h>
 
 #include "ash/wm/common/root_window_finder.h"
 #include "ash/wm/common/wm_lookup.h"
 #include "ash/wm/common/wm_root_window_controller.h"
 #include "ash/wm/common/wm_shell_window_ids.h"
 #include "ash/wm/common/wm_window.h"
-#include "grit/ash_wm_common_resources.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 {
 
 // The duration of the show animation.
 const int kAnimationDurationMs = 200;
 
 // The size of the phantom window at the beginning of the show animation in
 // relation to the size of the phantom window at the end of the animation.
 const float kStartBoundsRatio = 0.85f;
 
 // The amount of pixels that the phantom window's shadow should extend past
 // the bounds passed into Show().
 const int kShadowThickness = 15;
 
 // The minimum size of a phantom window including the shadow. The minimum size
-// is derived from the size of the IDR_ASH_WM_COMMON_PHANTOM_WINDOW image
-// assets.
+// is derived from the size of the IDR_AURA_PHANTOM_WINDOW image assets.
 const int kMinSizeWithShadow = 100;
 
 // Adjusts the phantom window's bounds so that the bounds:
 // - Include the size of the shadow.
 // - Have a size equal to or larger than the minimum phantom window size.
 gfx::Rect GetAdjustedBounds(const gfx::Rect& bounds) {
   int x_inset = std::max(
       static_cast<int>(ceil((kMinSizeWithShadow - bounds.width()) / 2.0f)),
       kShadowThickness);
   int y_inset = std::max(
@@ skipping 77 matching lines @@
   wm::WmWindow* phantom_widget_window =
       wm::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_ASH_WM_COMMON_PHANTOM_WINDOW);
+  const int kImages[] = IMAGE_GRID(IDR_AURA_PHANTOM_WINDOW);
   views::Painter* background_painter =
       views::Painter::CreateImageGridPainter(kImages);
   views::View* content_view = new views::View;
   content_view->set_background(
       views::Background::CreateBackgroundPainter(true, background_painter));
   phantom_widget->SetContentsView(content_view);
 
   // Show the widget after all the setups.
   phantom_widget->Show();
 
   // Fade the window in.
   ui::Layer* widget_layer = phantom_widget_window->GetLayer();
   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