ash/shell_unittest.cc - Issue 10810039: 2nd display should show the same background as login/lock screen:

Side by Side Diff: ash/shell_unittest.cc

Issue 10810039: 2nd display should show the same background as login/lock screen: (Closed) Base URL: http://git.chromium.org/chromium/src.git@master

Patch Set: Merge with ToT Created 8 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

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

6 #include "ash/launcher/launcher.h"	6 #include "ash/launcher/launcher.h"

7 #include "ash/shell.h"	7 #include "ash/shell.h"

8 #include "ash/shell_delegate.h"	8 #include "ash/shell_delegate.h"

9 #include "ash/shell_window_ids.h"	9 #include "ash/shell_window_ids.h"

10 #include "ash/test/ash_test_base.h"	10 #include "ash/test/ash_test_base.h"

(...skipping 40 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
51 root_window, internal::kShellWindowId_DefaultContainer));	51 root_window, internal::kShellWindowId_DefaultContainer));

52 EXPECT_TRUE(Shell::GetContainer(	52 EXPECT_TRUE(Shell::GetContainer(

53 root_window, internal::kShellWindowId_AlwaysOnTopContainer));	53 root_window, internal::kShellWindowId_AlwaysOnTopContainer));

54 EXPECT_TRUE(Shell::GetContainer(	54 EXPECT_TRUE(Shell::GetContainer(

55 root_window, internal::kShellWindowId_PanelContainer));	55 root_window, internal::kShellWindowId_PanelContainer));

56 EXPECT_TRUE(Shell::GetContainer(	56 EXPECT_TRUE(Shell::GetContainer(

57 root_window, internal::kShellWindowId_LauncherContainer));	57 root_window, internal::kShellWindowId_LauncherContainer));

58 EXPECT_TRUE(Shell::GetContainer(	58 EXPECT_TRUE(Shell::GetContainer(

59 root_window, internal::kShellWindowId_SystemModalContainer));	59 root_window, internal::kShellWindowId_SystemModalContainer));

60 EXPECT_TRUE(Shell::GetContainer(	60 EXPECT_TRUE(Shell::GetContainer(

	61 root_window, internal::kShellWindowId_LockScreenBackgroundContainer));

	62 EXPECT_TRUE(Shell::GetContainer(

61 root_window, internal::kShellWindowId_LockScreenContainer));	63 root_window, internal::kShellWindowId_LockScreenContainer));

62 EXPECT_TRUE(Shell::GetContainer(	64 EXPECT_TRUE(Shell::GetContainer(

63 root_window, internal::kShellWindowId_LockSystemModalContainer));	65 root_window, internal::kShellWindowId_LockSystemModalContainer));

64 EXPECT_TRUE(Shell::GetContainer(	66 EXPECT_TRUE(Shell::GetContainer(

65 root_window, internal::kShellWindowId_StatusContainer));	67 root_window, internal::kShellWindowId_StatusContainer));

66 EXPECT_TRUE(Shell::GetContainer(	68 EXPECT_TRUE(Shell::GetContainer(

67 root_window, internal::kShellWindowId_MenuContainer));	69 root_window, internal::kShellWindowId_MenuContainer));

68 EXPECT_TRUE(Shell::GetContainer(	70 EXPECT_TRUE(Shell::GetContainer(

69 root_window, internal::kShellWindowId_DragImageAndTooltipContainer));	71 root_window, internal::kShellWindowId_DragImageAndTooltipContainer));

70 EXPECT_TRUE(Shell::GetContainer(	72 EXPECT_TRUE(Shell::GetContainer(

(...skipping 262 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
333 private:	335 private:

334 DISALLOW_COPY_AND_ASSIGN(ShellTest2);	336 DISALLOW_COPY_AND_ASSIGN(ShellTest2);

335 };	337 };

336	338

337 TEST_F(ShellTest2, DontCrashWhenWindowDeleted) {	339 TEST_F(ShellTest2, DontCrashWhenWindowDeleted) {

338 window_.reset(new aura::Window(NULL));	340 window_.reset(new aura::Window(NULL));

339 window_->Init(ui::LAYER_NOT_DRAWN);	341 window_->Init(ui::LAYER_NOT_DRAWN);

340 }	342 }

341	343

342 } // namespace ash	344 } // namespace ash

OLD	NEW

« ash/desktop_background/desktop_background_controller.cc ('K') | « ash/shell_factory.h ('k') | ash/shell_window_ids.h » ('j') | ash/shell_window_ids.h » ('J')