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

ash/wm/image_grid.h

 // 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.
 
 #ifndef ASH_WM_IMAGE_GRID_H_
 #define ASH_WM_IMAGE_GRID_H_
 #pragma once
 
+#include "ash/ash_export.h"
 #include "base/basictypes.h"
 #include "base/gtest_prod_util.h"
 #include "base/memory/scoped_ptr.h"
-#include "ash/ash_export.h"
-#include "ui/gfx/compositor/layer.h"
-#include "ui/gfx/compositor/layer_delegate.h"
+#include "ui/compositor/layer.h"
+#include "ui/compositor/layer_delegate.h"
 #include "ui/gfx/rect.h"
 #include "ui/gfx/size.h"
 
 namespace aura {
 class Window;
 }  // namespace aura
 
 namespace gfx {
 class Image;
 }  // namespace gfx
@@ skipping 137 matching lines @@
 
   // Sets |layer_ptr| and |painter_ptr| to display |image| and adds the
   // passed-in layer to |layer_|.  If image is NULL resets |layer_ptr| and
   // |painter_ptr| and removes any existing layer from |layer_|.
   void SetImage(const gfx::Image* image,
                 scoped_ptr<ui::Layer>* layer_ptr,
                 scoped_ptr<ImagePainter>* painter_ptr);
 
   // A possibly-arbitrary window that is drawn at the same DPI
   // (i.e. on the same monitor) as this grid.
-  // TODO(oshima): move scale factor to gfx/compositor and remove this.
+  // TODO(oshima): move scale factor to ui/compositor/ and remove this.
   aura::Window* window_;
 
   // Layer that contains all of the image layers.
   scoped_ptr<ui::Layer> layer_;
 
   // The grid's dimensions.
   gfx::Size size_;
 
   // Heights and widths of the images displayed by |top_layer_|,
   // |bottom_layer_|, |left_layer_|, and |right_layer_|.
@@ skipping 34 matching lines @@
   scoped_ptr<ImagePainter> bottom_painter_;
   scoped_ptr<ImagePainter> bottom_right_painter_;
 
   DISALLOW_COPY_AND_ASSIGN(ImageGrid);
 };
 
 }  // namespace internal
 }  // namespace ash
 
 #endif  // ASH_WM_IMAGE_GRID_H_