ash/wm/image_grid.h - Issue 10365007: ui: Move compositor/ directory out of gfx/, up to ui/.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: ash/wm/image_grid.h

Issue 10365007: ui: Move compositor/ directory out of gfx/, up to ui/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: fix DEPS Created 8 years, 8 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:

Index: ash/wm/image_grid.h

diff --git a/ash/wm/image_grid.h b/ash/wm/image_grid.h

index 84119f5014af50f6b79eeb1b9788da4e898ff151..7b53f88ecaa3437bc716adbf32dbe4830f9b98dc 100644

--- a/ash/wm/image_grid.h

+++ b/ash/wm/image_grid.h

@@ -6,12 +6,12 @@

#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"

@@ -169,7 +169,7 @@ class ASH_EXPORT ImageGrid {

// 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.

« no previous file with comments | « ash/wm/default_window_resizer.cc ('k') | ash/wm/panel_window_event_filter.cc » ('j') | no next file with comments »