ash/dip_unittest.cc - Issue 10365007: ui: Move compositor/ directory out of gfx/, up to ui/.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

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

Side by Side Diff: ash/dip_unittest.cc

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, 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 unified diff | Download patch | Annotate | Revision Log

« no previous file with comments | « ash/desktop_background/desktop_background_view.cc ('k') | ash/drag_drop/drag_drop_controller.h » ('j') | no next file with comments »

OLD	NEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.

2 // Use of this source code is governed by a BSD-style license that can be	2 // Use of this source code is governed by a BSD-style license that can be

3 // found in the LICENSE file.	3 // found in the LICENSE file.

4	4

5 #include <algorithm>	5 #include <algorithm>

6 #include <vector>	6 #include <vector>

7	7

8 #include "ash/launcher/launcher.h"	8 #include "ash/launcher/launcher.h"

9 #include "ash/shell.h"	9 #include "ash/shell.h"

10 #include "ash/test/ash_test_base.h"	10 #include "ash/test/ash_test_base.h"

11 #include "ash/wm/shadow.h"	11 #include "ash/wm/shadow.h"

12 #include "ash/wm/shadow_controller.h"	12 #include "ash/wm/shadow_controller.h"

13 #include "ash/wm/shadow_types.h"	13 #include "ash/wm/shadow_types.h"

14 #include "ash/wm/window_properties.h"	14 #include "ash/wm/window_properties.h"

15 #include "ash/wm/window_util.h"	15 #include "ash/wm/window_util.h"

16 #include "base/memory/scoped_ptr.h"	16 #include "base/memory/scoped_ptr.h"

17 #include "ui/aura/client/activation_client.h"	17 #include "ui/aura/client/activation_client.h"

18 #include "ui/aura/root_window.h"	18 #include "ui/aura/root_window.h"

19 #include "ui/aura/window.h"	19 #include "ui/aura/window.h"

20 #include "ui/gfx/compositor/layer.h"	20 #include "ui/compositor/layer.h"

21 #include "ui/gfx/insets.h"	21 #include "ui/gfx/insets.h"

22 #include "ui/gfx/monitor.h"	22 #include "ui/gfx/monitor.h"

23 #include "ui/gfx/screen.h"	23 #include "ui/gfx/screen.h"

24 #include "ui/views/widget/widget.h"	24 #include "ui/views/widget/widget.h"

25	25

26 #if defined(ENABLE_DIP)	26 #if defined(ENABLE_DIP)

27 #define MAYBE_Shadow FAILS_Shadow	27 #define MAYBE_Shadow FAILS_Shadow

28 #define MAYBE_WorkArea FAILS_WorkArea	28 #define MAYBE_WorkArea FAILS_WorkArea

29 #else	29 #else

30 #define MAYBE_Shadow DISABLED_Shadow	30 #define MAYBE_Shadow DISABLED_Shadow

(...skipping 57 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
88	88

89 EXPECT_EQ(work_area.ToString(), monitor_2x.work_area().ToString());	89 EXPECT_EQ(work_area.ToString(), monitor_2x.work_area().ToString());

90	90

91 Launcher* launcher = Shell::GetInstance()->launcher();	91 Launcher* launcher = Shell::GetInstance()->launcher();

92 EXPECT_EQ(	92 EXPECT_EQ(

93 monitor_2x.bounds().InsetsFrom(work_area).height() * 2,	93 monitor_2x.bounds().InsetsFrom(work_area).height() * 2,

94 launcher->widget()->GetNativeView()->layer()->bounds().height());	94 launcher->widget()->GetNativeView()->layer()->bounds().height());

95 }	95 }

96	96

97 } // namespace ash	97 } // namespace ash

OLD	NEW