Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1797)

Unified Diff: ash/wm/image_grid.h

Issue 10221028: Move DIP translation from ui/aura to ui/compositor (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: disable tests that doesn't run on bots Created 8 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/monitor/multi_monitor_manager.cc ('k') | ash/wm/image_grid.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/wm/image_grid.h
diff --git a/ash/wm/image_grid.h b/ash/wm/image_grid.h
index 7b53f88ecaa3437bc716adbf32dbe4830f9b98dc..37fc37cfcc7184cc1bf0c343cd2d18d76a1a0405 100644
--- a/ash/wm/image_grid.h
+++ b/ash/wm/image_grid.h
@@ -15,10 +15,6 @@
#include "ui/gfx/rect.h"
#include "ui/gfx/size.h"
-namespace aura {
-class Window;
-} // namespace aura
-
namespace gfx {
class Image;
} // namespace gfx
@@ -91,7 +87,7 @@ class ASH_EXPORT ImageGrid {
DISALLOW_COPY_AND_ASSIGN(TestAPI);
};
- explicit ImageGrid(aura::Window* window);
+ ImageGrid();
~ImageGrid();
ui::Layer* layer() { return layer_.get(); }
@@ -167,11 +163,6 @@ class ASH_EXPORT ImageGrid {
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 ui/compositor/ and remove this.
- aura::Window* window_;
-
// Layer that contains all of the image layers.
scoped_ptr<ui::Layer> layer_;
« no previous file with comments | « ash/monitor/multi_monitor_manager.cc ('k') | ash/wm/image_grid.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698