ash/root_window_controller_unittest.cc - Issue 11363124: Move DisplayManager and DisplayChangeObserverX11 from aura to ash.

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/root_window_controller_unittest.cc

Issue 11363124: Move DisplayManager and DisplayChangeObserverX11 from aura to ash. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: ios fix Created 8 years, 1 month 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 | Annotate | Revision Log

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

6	6

7 #include "ash/display/display_controller.h"	7 #include "ash/display/display_controller.h"

8 #include "ash/display/multi_display_manager.h"

9 #include "ash/shell.h"	8 #include "ash/shell.h"

10 #include "ash/shell_delegate.h"	9 #include "ash/shell_delegate.h"

11 #include "ash/shell_window_ids.h"	10 #include "ash/shell_window_ids.h"

12 #include "ash/system/tray/system_tray_delegate.h"	11 #include "ash/system/tray/system_tray_delegate.h"

13 #include "ash/test/ash_test_base.h"	12 #include "ash/test/ash_test_base.h"

14 #include "ash/wm/system_modal_container_layout_manager.h"	13 #include "ash/wm/system_modal_container_layout_manager.h"

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

16 #include "ui/aura/env.h"	15 #include "ui/aura/env.h"

17 #include "ui/aura/focus_manager.h"	16 #include "ui/aura/focus_manager.h"

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

(...skipping 212 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
231 EXPECT_EQ(user::LOGGED_IN_LOCKED,	230 EXPECT_EQ(user::LOGGED_IN_LOCKED,

232 shell->tray_delegate()->GetUserLoginStatus());	231 shell->tray_delegate()->GetUserLoginStatus());

233 EXPECT_EQ(Shell::GetContainer(controller->root_window(),	232 EXPECT_EQ(Shell::GetContainer(controller->root_window(),

234 internal::kShellWindowId_LockSystemModalContainer)->layout_manager(),	233 internal::kShellWindowId_LockSystemModalContainer)->layout_manager(),

235 controller->GetSystemModalLayoutManager(NULL));	234 controller->GetSystemModalLayoutManager(NULL));

236 shell->delegate()->UnlockScreen();	235 shell->delegate()->UnlockScreen();

237 }	236 }

238	237

239 } // namespace test	238 } // namespace test

240 } // namespace ash	239 } // namespace ash

OLD	NEW

« ash/display/display_manager.h ('K') | « ash/root_window_controller.cc ('k') | ash/screen_ash.h » ('j') | ui/aura/display_util.cc » ('J')