ash/shelf/shelf_widget_unittest.cc - Issue 2274333002: ash: Move more code from Shelf to WmShelf

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_widget_unittest.cc

Issue 2274333002: ash: Move more code from Shelf to WmShelf (Closed)

Patch Set: review comments Created 4 years, 4 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/common/wm/panels/panel_window_resizer.cc ('k') | ash/wm/window_animations.cc » ('j') | no next file with comments »

OLD	NEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2013 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/common/shelf/shelf_widget.h"	5 #include "ash/common/shelf/shelf_widget.h"

6	6

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

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

8 #include "ash/common/shelf/shelf_delegate.h"	9 #include "ash/common/shelf/shelf_delegate.h"

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

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

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

12 #include "ash/common/system/status_area_widget.h"	13 #include "ash/common/system/status_area_widget.h"

13 #include "ash/common/wm_root_window_controller.h"	14 #include "ash/common/wm_root_window_controller.h"

14 #include "ash/common/wm_shell.h"	15 #include "ash/common/wm_shell.h"

15 #include "ash/common/wm_window.h"	16 #include "ash/common/wm_window.h"

16 #include "ash/root_window_controller.h"	17 #include "ash/root_window_controller.h"

17 #include "ash/shell.h"	18 #include "ash/shell.h"

(...skipping 469 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
487 }	488 }

488	489

489 TEST_P(ShelfWidgetTestWithDelegate, CreateLockedShelf) {	490 TEST_P(ShelfWidgetTestWithDelegate, CreateLockedShelf) {

490 // The auto hide state 'HIDDEN' is returned for any non-auto-hide behavior.	491 // The auto hide state 'HIDDEN' is returned for any non-auto-hide behavior.

491 TestCreateShelfWithInitialValues(SHELF_ALIGNMENT_BOTTOM_LOCKED,	492 TestCreateShelfWithInitialValues(SHELF_ALIGNMENT_BOTTOM_LOCKED,

492 SHELF_AUTO_HIDE_BEHAVIOR_NEVER,	493 SHELF_AUTO_HIDE_BEHAVIOR_NEVER,

493 SHELF_VISIBLE, SHELF_AUTO_HIDE_HIDDEN);	494 SHELF_VISIBLE, SHELF_AUTO_HIDE_HIDDEN);

494 }	495 }

495	496

496 } // namespace ash	497 } // namespace ash

OLD	NEW