Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(619)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ash/root_window_controller_unittest.cc

Issue 201573015: Introdcue AshWindowTreeHost and move ash/chrome specific code in WTH to ash. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 6 years, 8 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/root_window_controller.cc ('k') | ash/shell.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/root_window_controller_unittest.cc
diff --git a/ash/root_window_controller_unittest.cc b/ash/root_window_controller_unittest.cc
index b4fe9f57c08ebce0f9bc457778f0614be2385a4f..69aad6b7d4f9f9b1520813933fdf2611e598bb62 100644
--- a/ash/root_window_controller_unittest.cc
+++ b/ash/root_window_controller_unittest.cc
@@ -292,15 +292,13 @@ TEST_F(RootWindowControllerTest, ModalContainer) {
RootWindowController* controller = shell->GetPrimaryRootWindowController();
EXPECT_EQ(user::LOGGED_IN_USER,
shell->system_tray_delegate()->GetUserLoginStatus());
- EXPECT_EQ(Shell::GetContainer(controller->root_window(),
- kShellWindowId_SystemModalContainer)
+ EXPECT_EQ(controller->GetContainer(kShellWindowId_SystemModalContainer)
->layout_manager(),
controller->GetSystemModalLayoutManager(NULL));
views::Widget* session_modal_widget =
CreateModalWidget(gfx::Rect(300, 10, 100, 100));
- EXPECT_EQ(Shell::GetContainer(controller->root_window(),
- kShellWindowId_SystemModalContainer)
+ EXPECT_EQ(controller->GetContainer(kShellWindowId_SystemModalContainer)
->layout_manager(),
controller->GetSystemModalLayoutManager(
session_modal_widget->GetNativeView()));
@@ -308,22 +306,19 @@ TEST_F(RootWindowControllerTest, ModalContainer) {
shell->session_state_delegate()->LockScreen();
EXPECT_EQ(user::LOGGED_IN_LOCKED,
shell->system_tray_delegate()->GetUserLoginStatus());
- EXPECT_EQ(Shell::GetContainer(controller->root_window(),
- kShellWindowId_LockSystemModalContainer)
+ EXPECT_EQ(controller->GetContainer(kShellWindowId_LockSystemModalContainer)
->layout_manager(),
controller->GetSystemModalLayoutManager(NULL));
- aura::Window* lock_container = Shell::GetContainer(
- controller->root_window(), kShellWindowId_LockScreenContainer);
+ aura::Window* lock_container =
+ controller->GetContainer(kShellWindowId_LockScreenContainer);
views::Widget* lock_modal_widget =
CreateModalWidgetWithParent(gfx::Rect(300, 10, 100, 100), lock_container);
- EXPECT_EQ(Shell::GetContainer(controller->root_window(),
- kShellWindowId_LockSystemModalContainer)
+ EXPECT_EQ(controller->GetContainer(kShellWindowId_LockSystemModalContainer)
->layout_manager(),
controller->GetSystemModalLayoutManager(
lock_modal_widget->GetNativeView()));
- EXPECT_EQ(Shell::GetContainer(controller->root_window(),
- kShellWindowId_SystemModalContainer)
+ EXPECT_EQ(controller->GetContainer(kShellWindowId_SystemModalContainer)
->layout_manager(),
controller->GetSystemModalLayoutManager(
session_modal_widget->GetNativeView()));
@@ -343,17 +338,15 @@ TEST_F(RootWindowControllerTest, ModalContainerNotLoggedInLoggedIn) {
EXPECT_FALSE(shell->session_state_delegate()->IsActiveUserSessionStarted());
RootWindowController* controller = shell->GetPrimaryRootWindowController();
- EXPECT_EQ(Shell::GetContainer(controller->root_window(),
- kShellWindowId_LockSystemModalContainer)
+ EXPECT_EQ(controller->GetContainer(kShellWindowId_LockSystemModalContainer)
->layout_manager(),
controller->GetSystemModalLayoutManager(NULL));
- aura::Window* lock_container = Shell::GetContainer(
- controller->root_window(), kShellWindowId_LockScreenContainer);
+ aura::Window* lock_container =
+ controller->GetContainer(kShellWindowId_LockScreenContainer);
views::Widget* login_modal_widget =
CreateModalWidgetWithParent(gfx::Rect(300, 10, 100, 100), lock_container);
- EXPECT_EQ(Shell::GetContainer(controller->root_window(),
- kShellWindowId_LockSystemModalContainer)
+ EXPECT_EQ(controller->GetContainer(kShellWindowId_LockSystemModalContainer)
->layout_manager(),
controller->GetSystemModalLayoutManager(
login_modal_widget->GetNativeView()));
@@ -366,15 +359,13 @@ TEST_F(RootWindowControllerTest, ModalContainerNotLoggedInLoggedIn) {
shell->system_tray_delegate()->GetUserLoginStatus());
EXPECT_EQ(1, shell->session_state_delegate()->NumberOfLoggedInUsers());
EXPECT_TRUE(shell->session_state_delegate()->IsActiveUserSessionStarted());
- EXPECT_EQ(Shell::GetContainer(controller->root_window(),
- kShellWindowId_SystemModalContainer)
+ EXPECT_EQ(controller->GetContainer(kShellWindowId_SystemModalContainer)
->layout_manager(),
controller->GetSystemModalLayoutManager(NULL));
views::Widget* session_modal_widget =
CreateModalWidget(gfx::Rect(300, 10, 100, 100));
- EXPECT_EQ(Shell::GetContainer(controller->root_window(),
- kShellWindowId_SystemModalContainer)
+ EXPECT_EQ(controller->GetContainer(kShellWindowId_SystemModalContainer)
->layout_manager(),
controller->GetSystemModalLayoutManager(
session_modal_widget->GetNativeView()));
@@ -384,44 +375,39 @@ TEST_F(RootWindowControllerTest, ModalContainerBlockedSession) {
UpdateDisplay("600x600");
Shell* shell = Shell::GetInstance();
RootWindowController* controller = shell->GetPrimaryRootWindowController();
- aura::Window* lock_container = Shell::GetContainer(
- controller->root_window(), kShellWindowId_LockScreenContainer);
+ aura::Window* lock_container =
+ controller->GetContainer(kShellWindowId_LockScreenContainer);
for (int block_reason = FIRST_BLOCK_REASON;
block_reason < NUMBER_OF_BLOCK_REASONS;
++block_reason) {
views::Widget* session_modal_widget =
CreateModalWidget(gfx::Rect(300, 10, 100, 100));
- EXPECT_EQ(Shell::GetContainer(controller->root_window(),
- kShellWindowId_SystemModalContainer)
+ EXPECT_EQ(controller->GetContainer(kShellWindowId_SystemModalContainer)
->layout_manager(),
controller->GetSystemModalLayoutManager(
session_modal_widget->GetNativeView()));
- EXPECT_EQ(Shell::GetContainer(controller->root_window(),
- kShellWindowId_SystemModalContainer)
+ EXPECT_EQ(controller->GetContainer(kShellWindowId_SystemModalContainer)
->layout_manager(),
controller->GetSystemModalLayoutManager(NULL));
session_modal_widget->Close();
BlockUserSession(static_cast<UserSessionBlockReason>(block_reason));
- EXPECT_EQ(Shell::GetContainer(controller->root_window(),
- kShellWindowId_LockSystemModalContainer)
+ EXPECT_EQ(controller->GetContainer(kShellWindowId_LockSystemModalContainer)
->layout_manager(),
controller->GetSystemModalLayoutManager(NULL));
views::Widget* lock_modal_widget =
CreateModalWidgetWithParent(gfx::Rect(300, 10, 100, 100),
lock_container);
- EXPECT_EQ(Shell::GetContainer(controller->root_window(),
- kShellWindowId_LockSystemModalContainer)
+ EXPECT_EQ(controller->GetContainer(kShellWindowId_LockSystemModalContainer)
->layout_manager(),
controller->GetSystemModalLayoutManager(
lock_modal_widget->GetNativeView()));
session_modal_widget =
CreateModalWidget(gfx::Rect(300, 10, 100, 100));
- EXPECT_EQ(Shell::GetContainer(controller->root_window(),
- kShellWindowId_SystemModalContainer)
+ EXPECT_EQ(controller->GetContainer(kShellWindowId_SystemModalContainer)
->layout_manager(),
controller->GetSystemModalLayoutManager(
session_modal_widget->GetNativeView()));
@@ -479,11 +465,11 @@ TEST_F(RootWindowControllerTest, MultipleDisplaysGetWindowForFullscreenMode) {
Widget* w3 = CreateTestWidget(gfx::Rect(600, 0, 100, 100));
EXPECT_EQ(w1->GetNativeWindow()->GetRootWindow(),
- controllers[0]->root_window());
+ controllers[0]->GetRootWindow());
EXPECT_EQ(w2->GetNativeWindow()->GetRootWindow(),
- controllers[0]->root_window());
+ controllers[0]->GetRootWindow());
EXPECT_EQ(w3->GetNativeWindow()->GetRootWindow(),
- controllers[1]->root_window());
+ controllers[1]->GetRootWindow());
w1->Activate();
EXPECT_EQ(NULL, controllers[0]->GetWindowForFullscreenMode());
@@ -508,8 +494,8 @@ TEST_F(RootWindowControllerTest, FocusBlockedWindow) {
UpdateDisplay("600x600");
RootWindowController* controller =
Shell::GetInstance()->GetPrimaryRootWindowController();
- aura::Window* lock_container = Shell::GetContainer(
- controller->root_window(), kShellWindowId_LockScreenContainer);
+ aura::Window* lock_container =
+ controller->GetContainer(kShellWindowId_LockScreenContainer);
aura::Window* lock_window = Widget::CreateWindowWithParentAndBounds(NULL,
lock_container, gfx::Rect(0, 0, 100, 100))->GetNativeView();
lock_window->Show();
« no previous file with comments | « ash/root_window_controller.cc ('k') | ash/shell.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698