ash/shell_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/shell_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 "ash/shell.h"	5 #include "ash/shell.h"

6	6

7 #include <algorithm>	7 #include <algorithm>

8 #include <vector>	8 #include <vector>

9	9

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

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

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

13 #include "ash/common/shelf/shelf_widget.h"	12 #include "ash/common/shelf/shelf_widget.h"

14 #include "ash/common/shelf/wm_shelf.h"	13 #include "ash/common/shelf/wm_shelf.h"

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

16 #include "ash/common/wallpaper/wallpaper_widget_controller.h"	15 #include "ash/common/wallpaper/wallpaper_widget_controller.h"

17 #include "ash/common/wm_root_window_controller.h"	16 #include "ash/common/wm_root_window_controller.h"

18 #include "ash/common/wm_shell.h"	17 #include "ash/common/wm_shell.h"

19 #include "ash/common/wm_window.h"	18 #include "ash/common/wm_window.h"

20 #include "ash/display/mouse_cursor_event_filter.h"	19 #include "ash/display/mouse_cursor_event_filter.h"

(...skipping 487 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
508 private:	507 private:

509 DISALLOW_COPY_AND_ASSIGN(ShellTest2);	508 DISALLOW_COPY_AND_ASSIGN(ShellTest2);

510 };	509 };

511	510

512 TEST_F(ShellTest2, DontCrashWhenWindowDeleted) {	511 TEST_F(ShellTest2, DontCrashWhenWindowDeleted) {

513 window_.reset(new aura::Window(NULL));	512 window_.reset(new aura::Window(NULL));

514 window_->Init(ui::LAYER_NOT_DRAWN);	513 window_->Init(ui::LAYER_NOT_DRAWN);

515 }	514 }

516	515

517 } // namespace ash	516 } // namespace ash

OLD	NEW