ash/display/display_manager_unittest.cc - Issue 2162193003: Separates out accelerators using non-common types

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/display/display_manager_unittest.cc

Issue 2162193003: Separates out accelerators using non-common types (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@accelerators

Patch Set: fix compile issues Created 4 years, 5 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

« ash/accelerators/accelerator_controller_delegate_aura.cc ('K') | « ash/common/wm/window_positioning_utils.cc ('k') | ash/shell.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 "ash/display/display_manager.h"	5 #include "ash/display/display_manager.h"

6	6

7 #include "ash/accelerators/accelerator_commands.h"	7 #include "ash/accelerators/accelerator_commands_aura.h"

8 #include "ash/common/ash_switches.h"	8 #include "ash/common/ash_switches.h"

9 #include "ash/common/display/display_info.h"	9 #include "ash/common/display/display_info.h"

10 #include "ash/common/material_design/material_design_controller.h"	10 #include "ash/common/material_design/material_design_controller.h"

11 #include "ash/common/wm/window_state.h"	11 #include "ash/common/wm/window_state.h"

12 #include "ash/display/display_configuration_controller.h"	12 #include "ash/display/display_configuration_controller.h"

13 #include "ash/display/display_layout_store.h"	13 #include "ash/display/display_layout_store.h"

14 #include "ash/display/display_util.h"	14 #include "ash/display/display_util.h"

15 #include "ash/display/mirror_window_controller.h"	15 #include "ash/display/mirror_window_controller.h"

16 #include "ash/display/window_tree_host_manager.h"	16 #include "ash/display/window_tree_host_manager.h"

17 #include "ash/screen_util.h"	17 #include "ash/screen_util.h"

(...skipping 2309 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
2327 const display::DisplayLayout& stored =	2327 const display::DisplayLayout& stored =

2328 layout_store->GetRegisteredDisplayLayout(list);	2328 layout_store->GetRegisteredDisplayLayout(list);

2329	2329

2330 EXPECT_EQ(id1, stored.placement_list[0].parent_display_id);	2330 EXPECT_EQ(id1, stored.placement_list[0].parent_display_id);

2331 EXPECT_EQ(id2, stored.placement_list[0].display_id);	2331 EXPECT_EQ(id2, stored.placement_list[0].display_id);

2332 }	2332 }

2333	2333

2334 #endif // OS_CHROMEOS	2334 #endif // OS_CHROMEOS

2335	2335

2336 } // namespace ash	2336 } // namespace ash

OLD	NEW