Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / ash / drag_drop / drag_image_view.cc

diff --git a/src/ash/drag_drop/drag_image_view.cc b/src/ash/drag_drop/drag_image_view.cc
index d9a9e88..2148209 100644 (file)
--- a/src/ash/drag_drop/drag_image_view.cc
+++ b/src/ash/drag_drop/drag_image_view.cc
@@ -4,19 +4,17 @@
 
 #include "ash/drag_drop/drag_image_view.h"
 
-#include "grit/ui_resources.h"
 #include "skia/ext/image_operations.h"
 #include "ui/aura/window.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/compositor/dip_util.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/size_conversions.h"
-#include "ui/views/corewm/shadow_types.h"
+#include "ui/resources/grit/ui_resources.h"
 #include "ui/views/widget/widget.h"
+#include "ui/wm/core/shadow_types.h"
 
 namespace ash {
-namespace internal {
-
 namespace {
 using views::Widget;
 
@@ -33,7 +31,7 @@ Widget* CreateDragWidget(gfx::NativeView context) {
   drag_widget->SetOpacity(0xFF);
   drag_widget->GetNativeWindow()->set_owned_by_parent(false);
   drag_widget->GetNativeWindow()->SetName("DragWidget");
-  SetShadowType(drag_widget->GetNativeView(), views::corewm::SHADOW_TYPE_NONE);
+  SetShadowType(drag_widget->GetNativeView(), wm::SHADOW_TYPE_NONE);
   return drag_widget;
 }
 }
@@ -171,5 +169,4 @@ void DragImageView::OnPaint(gfx::Canvas* canvas) {
   }
 }
 
-}  // namespace internal
 }  // namespace ash