Move DIP translation from ui/aura to ui/compositor

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 "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/gfx/rect.h"
 #include "ui/gfx/size.h"
 
-namespace aura {
-class Window;
-}  // namespace aura
-
 namespace gfx {
 class Image;
 }  // namespace gfx
 
 namespace ash {
 namespace internal {
 
 // An ImageGrid is a 3x3 array of ui::Layers, each containing an image.
 //
 // As the grid is resized, its images fill the requested space:
@@ skipping 52 matching lines @@
 
     // Returns |layer|'s bounds after applying the layer's current transform.
     gfx::Rect GetTransformedLayerBounds(const ui::Layer& layer);
 
    private:
     ImageGrid* grid_;  // not owned
 
     DISALLOW_COPY_AND_ASSIGN(TestAPI);
   };
 
-  explicit ImageGrid(aura::Window* window);
+  ImageGrid();
   ~ImageGrid();
 
   ui::Layer* layer() { return layer_.get(); }
   int top_image_height() const { return top_image_height_; }
   int bottom_image_height() const { return bottom_image_height_; }
   int left_image_width() const { return left_image_width_; }
   int right_image_width() const { return right_image_width_; }
 
   // Visible to allow independent layer animations and for testing.
   ui::Layer* top_left_layer() const { return top_left_layer_.get(); }
@@ skipping 55 matching lines @@
   // Returns true if |layer|'s bounds don't fit within |size|.
   static bool LayerExceedsSize(const ui::Layer* layer, const gfx::Size& size);
 
   // 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.
-  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_|.
   int top_image_height_;
   int bottom_image_height_;
@@ skipping 32 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_