ash/shelf/shelf_layout_manager_unittest.cc - Issue 2074213002: mash: Move ash_switches.* to ash/common; cleanup DEPS.

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/shelf/shelf_layout_manager_unittest.cc

Issue 2074213002: mash: Move ash_switches.* to ash/common; cleanup DEPS. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fix broken relative include. Created 4 years, 6 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

« no previous file with comments | « ash/shelf/shelf_layout_manager.cc ('k') | ash/shelf/shelf_navigator_unittest.cc » ('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/shelf/shelf_layout_manager.h"	5 #include "ash/shelf/shelf_layout_manager.h"

6	6

7 #include "ash/accelerators/accelerator_controller.h"	7 #include "ash/accelerators/accelerator_controller.h"

8 #include "ash/accelerators/accelerator_table.h"	8 #include "ash/accelerators/accelerator_table.h"

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

10 #include "ash/common/focus_cycler.h"	10 #include "ash/common/focus_cycler.h"

11 #include "ash/common/session/session_state_delegate.h"	11 #include "ash/common/session/session_state_delegate.h"

12 #include "ash/common/shelf/shelf_constants.h"	12 #include "ash/common/shelf/shelf_constants.h"

13 #include "ash/common/shell_window_ids.h"	13 #include "ash/common/shell_window_ids.h"

14 #include "ash/common/system/tray/system_tray_item.h"	14 #include "ash/common/system/tray/system_tray_item.h"

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

16 #include "ash/common/wm_shell.h"	16 #include "ash/common/wm_shell.h"

17 #include "ash/display/display_manager.h"	17 #include "ash/display/display_manager.h"

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

19 #include "ash/root_window_controller.h"	19 #include "ash/root_window_controller.h"

(...skipping 2274 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
2294 ->shelf_widget()	2294 ->shelf_widget()

2295 ->status_area_widget();	2295 ->status_area_widget();

2296 EXPECT_TRUE(status_area_widget->IsVisible());	2296 EXPECT_TRUE(status_area_widget->IsVisible());

2297 // Shelf should be in the first display's area.	2297 // Shelf should be in the first display's area.

2298 gfx::Rect status_area_bounds(status_area_widget->GetWindowBoundsInScreen());	2298 gfx::Rect status_area_bounds(status_area_widget->GetWindowBoundsInScreen());

2299 EXPECT_TRUE(gfx::Rect(0, 0, 500, 400).Contains(status_area_bounds));	2299 EXPECT_TRUE(gfx::Rect(0, 0, 500, 400).Contains(status_area_bounds));

2300 EXPECT_EQ(gfx::Point(500, 400), status_area_bounds.bottom_right());	2300 EXPECT_EQ(gfx::Point(500, 400), status_area_bounds.bottom_right());

2301 }	2301 }

2302	2302

2303 } // namespace ash	2303 } // namespace ash

OLD	NEW