ui: Move compositor/ directory out of gfx/, up to ui/.

ui/compositor/layer.h

Index: ui/compositor/layer.h
diff --git a/ui/gfx/compositor/layer.h b/ui/compositor/layer.h
similarity index 97%
rename from ui/gfx/compositor/layer.h
rename to ui/compositor/layer.h
index 77237d224afdf00854a405354593f593eea5d5a2..e74d5537df06b76b916249588a9392cd58b800b2 100644
--- a/ui/gfx/compositor/layer.h
+++ b/ui/compositor/layer.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef UI_GFX_COMPOSITOR_LAYER_H_
-#define UI_GFX_COMPOSITOR_LAYER_H_
+#ifndef UI_COMPOSITOR_LAYER_H_
+#define UI_COMPOSITOR_LAYER_H_
 #pragma once
 
 #include <string>
@@ -13,16 +13,16 @@
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
-#include "third_party/skia/include/core/SkColor.h"
-#include "third_party/skia/include/core/SkRegion.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebContentLayerClient.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebLayer.h"
+#include "third_party/skia/include/core/SkColor.h"
+#include "third_party/skia/include/core/SkRegion.h"
+#include "ui/compositor/compositor.h"
+#include "ui/compositor/layer_animation_delegate.h"
+#include "ui/compositor/layer_delegate.h"
+#include "ui/compositor/layer_type.h"
 #include "ui/gfx/rect.h"
 #include "ui/gfx/transform.h"
-#include "ui/gfx/compositor/compositor.h"
-#include "ui/gfx/compositor/layer_animation_delegate.h"
-#include "ui/gfx/compositor/layer_delegate.h"
-#include "ui/gfx/compositor/layer_type.h"
 
 class SkCanvas;
 
@@ -298,4 +298,4 @@ class COMPOSITOR_EXPORT Layer :
 
 }  // namespace ui
 
-#endif  // UI_GFX_COMPOSITOR_LAYER_H_
+#endif  // UI_COMPOSITOR_LAYER_H_