ash/dip_unittest.cc - Issue 2314853003: Move ash::DisplayManager switches to ui::display

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 2314853003: Move ash::DisplayManager switches to ui::display (Closed)

Patch Set: rebased again Created 4 years, 3 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

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/common/ash_switches.h"

9 #include "ash/common/material_design/material_design_controller.h"	8 #include "ash/common/material_design/material_design_controller.h"

10 #include "ash/common/shelf/shelf_widget.h"	9 #include "ash/common/shelf/shelf_widget.h"

11 #include "ash/common/shelf/wm_shelf.h"	10 #include "ash/common/shelf/wm_shelf.h"

12 #include "ash/display/display_manager.h"	11 #include "ash/display/display_manager.h"

13 #include "ash/shell.h"	12 #include "ash/shell.h"

14 #include "ash/test/ash_md_test_base.h"	13 #include "ash/test/ash_md_test_base.h"

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

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

17 #include "base/command_line.h"	16 #include "base/command_line.h"

18 #include "ui/aura/window.h"	17 #include "ui/aura/window.h"

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

77 // Sanity check if the workarea's inset hight is same as	76 // Sanity check if the workarea's inset hight is same as

78 // the shelf's height.	77 // the shelf's height.

79 WmShelf* shelf = GetPrimaryShelf();	78 WmShelf* shelf = GetPrimaryShelf();

80 EXPECT_EQ(display_2x.bounds().InsetsFrom(work_area).height(),	79 EXPECT_EQ(display_2x.bounds().InsetsFrom(work_area).height(),

81 shelf->shelf_widget()->GetNativeView()->layer()->bounds().height());	80 shelf->shelf_widget()->GetNativeView()->layer()->bounds().height());

82 }	81 }

83 #endif // defined(OS_CHROMEOS)	82 #endif // defined(OS_CHROMEOS)

84	83

85 } // namespace ash	84 } // namespace ash

OLD	NEW