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

ui/compositor/compositor.h

Index: ui/compositor/compositor.h
diff --git a/ui/gfx/compositor/compositor.h b/ui/compositor/compositor.h
similarity index 97%
rename from ui/gfx/compositor/compositor.h
rename to ui/compositor/compositor.h
index 9475cf62445acfe2de8b85b8450cbaba2fe1cf07..2bb40838b1b04b98e2a673244d021ca0ba5753ee 100644
--- a/ui/gfx/compositor/compositor.h
+++ b/ui/compositor/compositor.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_COMPOSITOR_H_
-#define UI_GFX_COMPOSITOR_COMPOSITOR_H_
+#ifndef UI_COMPOSITOR_COMPOSITOR_H_
+#define UI_COMPOSITOR_COMPOSITOR_H_
 #pragma once
 
 #include "base/hash_tables.h"
@@ -12,14 +12,14 @@
 #include "third_party/WebKit/Source/Platform/chromium/public/WebLayer.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebLayerTreeView.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebLayerTreeViewClient.h"
-#include "ui/gfx/compositor/compositor_export.h"
+#include "ui/compositor/compositor_export.h"
 #include "ui/gfx/gl/gl_share_group.h"
 #include "ui/gfx/native_widget_types.h"
 #include "ui/gfx/size.h"
 #include "ui/gfx/transform.h"
 
-
 class SkBitmap;
+
 namespace gfx {
 class GLContext;
 class GLSurface;
@@ -213,6 +213,8 @@ class COMPOSITOR_EXPORT Compositor
   virtual void scheduleComposite();
 
  private:
+  friend class base::RefCounted<Compositor>;
+
   // When reading back pixel data we often get RGBA rather than BGRA pixels and
   // and the image often needs to be flipped vertically.
   static void SwizzleRGBAToBGRAAndFlip(unsigned char* pixels,
@@ -236,10 +238,8 @@ class COMPOSITOR_EXPORT Compositor
   // This is set to true when the swap buffers has been posted and we're waiting
   // for completion.
   bool swap_posted_;
-
-  friend class base::RefCounted<Compositor>;
 };
 
 }  // namespace ui
 
-#endif  // UI_GFX_COMPOSITOR_COMPOSITOR_H_
+#endif  // UI_COMPOSITOR_COMPOSITOR_H_