Eliminate ash::internal namespace

ash/root_window_controller_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/root_window_controller.h"
 
 #include "ash/session_state_delegate.h"
 #include "ash/shelf/shelf_layout_manager.h"
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
@@ skipping 100 matching lines @@
                                              gfx::NativeWindow parent) {
     views::Widget* widget =
         views::Widget::CreateWindowWithParentAndBounds(new TestDelegate(true),
                                                        parent,
                                                        bounds);
     widget->Show();
     return widget;
   }
 
   aura::Window* GetModalContainer(aura::Window* root_window) {
-    return Shell::GetContainer(
-        root_window,
-        ash::internal::kShellWindowId_SystemModalContainer);
+    return Shell::GetContainer(root_window,
+                               ash::kShellWindowId_SystemModalContainer);
   }
 };
 
 TEST_F(RootWindowControllerTest, MoveWindows_Basic) {
   if (!SupportsMultipleDisplays())
     return;
   // Windows origin should be doubled when moved to the 1st display.
   UpdateDisplay("600x600,300x300");
   aura::Window::Windows root_windows = Shell::GetAllRootWindows();
-  internal::RootWindowController* controller =
-      Shell::GetPrimaryRootWindowController();
-  internal::ShelfLayoutManager* shelf_layout_manager =
+  RootWindowController* controller = Shell::GetPrimaryRootWindowController();
+  ShelfLayoutManager* shelf_layout_manager =
       controller->GetShelfLayoutManager();
   shelf_layout_manager->SetAutoHideBehavior(
       ash::SHELF_AUTO_HIDE_BEHAVIOR_ALWAYS);
 
   views::Widget* normal = CreateTestWidget(gfx::Rect(650, 10, 100, 100));
   EXPECT_EQ(root_windows[1], normal->GetNativeView()->GetRootWindow());
   EXPECT_EQ("650,10 100x100", normal->GetWindowBoundsInScreen().ToString());
   EXPECT_EQ("50,10 100x100",
             normal->GetNativeView()->GetBoundsInRootWindow().ToString());
 
@@ skipping 20 matching lines @@
             fullscreen->GetNativeView()->GetBoundsInRootWindow().ToString());
 
   views::Widget* unparented_control = new Widget;
   Widget::InitParams params;
   params.bounds = gfx::Rect(650, 10, 100, 100);
   params.context = CurrentContext();
   params.type = Widget::InitParams::TYPE_CONTROL;
   unparented_control->Init(params);
   EXPECT_EQ(root_windows[1],
             unparented_control->GetNativeView()->GetRootWindow());
-  EXPECT_EQ(internal::kShellWindowId_UnparentedControlContainer,
+  EXPECT_EQ(kShellWindowId_UnparentedControlContainer,
             unparented_control->GetNativeView()->parent()->id());
 
   aura::Window* panel = CreateTestWindowInShellWithDelegateAndType(
       NULL, ui::wm::WINDOW_TYPE_PANEL, 0, gfx::Rect(700, 100, 100, 100));
   EXPECT_EQ(root_windows[1], panel->GetRootWindow());
-  EXPECT_EQ(internal::kShellWindowId_PanelContainer, panel->parent()->id());
+  EXPECT_EQ(kShellWindowId_PanelContainer, panel->parent()->id());
 
   // Make sure a window that will delete itself when losing focus
   // will not crash.
   aura::WindowTracker tracker;
   DeleteOnBlurDelegate delete_on_blur_delegate;
   aura::Window* d2 = CreateTestWindowInShellWithDelegate(
       &delete_on_blur_delegate, 0, gfx::Rect(50, 50, 100, 100));
   delete_on_blur_delegate.SetWindow(d2);
   aura::client::GetFocusClient(root_windows[0])->FocusWindow(d2);
   tracker.Add(d2);
@@ skipping 48 matching lines @@
 
   fullscreen->SetFullscreen(false);
   EXPECT_EQ("500,20 100x100",
             fullscreen->GetWindowBoundsInScreen().ToString());
   EXPECT_EQ("500,20 100x100",
             fullscreen->GetNativeView()->GetBoundsInRootWindow().ToString());
 
   // Test if the unparented widget has moved.
   EXPECT_EQ(root_windows[0],
             unparented_control->GetNativeView()->GetRootWindow());
-  EXPECT_EQ(internal::kShellWindowId_UnparentedControlContainer,
+  EXPECT_EQ(kShellWindowId_UnparentedControlContainer,
             unparented_control->GetNativeView()->parent()->id());
 
   // Test if the panel has moved.
   EXPECT_EQ(root_windows[0], panel->GetRootWindow());
-  EXPECT_EQ(internal::kShellWindowId_PanelContainer, panel->parent()->id());
+  EXPECT_EQ(kShellWindowId_PanelContainer, panel->parent()->id());
 }
 
 TEST_F(RootWindowControllerTest, MoveWindows_Modal) {
   if (!SupportsMultipleDisplays())
     return;
 
   UpdateDisplay("500x500,500x500");
 
   aura::Window::Windows root_windows = Shell::GetAllRootWindows();
   // Emulate virtual screen coordinate system.
@@ skipping 17 matching lines @@
   UpdateDisplay("500x500");
   EXPECT_EQ(root_windows[0], modal->GetNativeView()->GetRootWindow());
   EXPECT_TRUE(wm::IsActiveWindow(modal->GetNativeView()));
   generator_1st.ClickLeftButton();
   EXPECT_TRUE(wm::IsActiveWindow(modal->GetNativeView()));
 }
 
 TEST_F(RootWindowControllerTest, ModalContainer) {
   UpdateDisplay("600x600");
   Shell* shell = Shell::GetInstance();
-  internal::RootWindowController* controller =
-      shell->GetPrimaryRootWindowController();
+  RootWindowController* controller = shell->GetPrimaryRootWindowController();
   EXPECT_EQ(user::LOGGED_IN_USER,
             shell->system_tray_delegate()->GetUserLoginStatus());
   EXPECT_EQ(Shell::GetContainer(controller->root_window(),
-      internal::kShellWindowId_SystemModalContainer)->layout_manager(),
-          controller->GetSystemModalLayoutManager(NULL));
+                                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(),
-      internal::kShellWindowId_SystemModalContainer)->layout_manager(),
-          controller->GetSystemModalLayoutManager(
-              session_modal_widget->GetNativeView()));
+                                kShellWindowId_SystemModalContainer)
+                ->layout_manager(),
+            controller->GetSystemModalLayoutManager(
+                session_modal_widget->GetNativeView()));
 
   shell->session_state_delegate()->LockScreen();
   EXPECT_EQ(user::LOGGED_IN_LOCKED,
             shell->system_tray_delegate()->GetUserLoginStatus());
   EXPECT_EQ(Shell::GetContainer(controller->root_window(),
-      internal::kShellWindowId_LockSystemModalContainer)->layout_manager(),
-          controller->GetSystemModalLayoutManager(NULL));
+                                kShellWindowId_LockSystemModalContainer)
+                ->layout_manager(),
+            controller->GetSystemModalLayoutManager(NULL));
 
-  aura::Window* lock_container =
-      Shell::GetContainer(controller->root_window(),
-                          internal::kShellWindowId_LockScreenContainer);
+  aura::Window* lock_container = Shell::GetContainer(
+      controller->root_window(), kShellWindowId_LockScreenContainer);
   views::Widget* lock_modal_widget =
       CreateModalWidgetWithParent(gfx::Rect(300, 10, 100, 100), lock_container);
   EXPECT_EQ(Shell::GetContainer(controller->root_window(),
-      internal::kShellWindowId_LockSystemModalContainer)->layout_manager(),
-          controller->GetSystemModalLayoutManager(
-              lock_modal_widget->GetNativeView()));
+                                kShellWindowId_LockSystemModalContainer)
+                ->layout_manager(),
+            controller->GetSystemModalLayoutManager(
+                lock_modal_widget->GetNativeView()));
   EXPECT_EQ(Shell::GetContainer(controller->root_window(),
-        internal::kShellWindowId_SystemModalContainer)->layout_manager(),
+                                kShellWindowId_SystemModalContainer)
+                ->layout_manager(),
             controller->GetSystemModalLayoutManager(
                 session_modal_widget->GetNativeView()));
 
   shell->session_state_delegate()->UnlockScreen();
 }
 
 TEST_F(RootWindowControllerTest, ModalContainerNotLoggedInLoggedIn) {
   UpdateDisplay("600x600");
   Shell* shell = Shell::GetInstance();
 
   // Configure login screen environment.
   SetUserLoggedIn(false);
   EXPECT_EQ(user::LOGGED_IN_NONE,
             shell->system_tray_delegate()->GetUserLoginStatus());
   EXPECT_EQ(0, shell->session_state_delegate()->NumberOfLoggedInUsers());
   EXPECT_FALSE(shell->session_state_delegate()->IsActiveUserSessionStarted());
 
-  internal::RootWindowController* controller =
-      shell->GetPrimaryRootWindowController();
+  RootWindowController* controller = shell->GetPrimaryRootWindowController();
   EXPECT_EQ(Shell::GetContainer(controller->root_window(),
-      internal::kShellWindowId_LockSystemModalContainer)->layout_manager(),
-          controller->GetSystemModalLayoutManager(NULL));
+                                kShellWindowId_LockSystemModalContainer)
+                ->layout_manager(),
+            controller->GetSystemModalLayoutManager(NULL));
 
-  aura::Window* lock_container =
-      Shell::GetContainer(controller->root_window(),
-                          internal::kShellWindowId_LockScreenContainer);
+  aura::Window* lock_container = Shell::GetContainer(
+      controller->root_window(), kShellWindowId_LockScreenContainer);
   views::Widget* login_modal_widget =
       CreateModalWidgetWithParent(gfx::Rect(300, 10, 100, 100), lock_container);
   EXPECT_EQ(Shell::GetContainer(controller->root_window(),
-      internal::kShellWindowId_LockSystemModalContainer)->layout_manager(),
-          controller->GetSystemModalLayoutManager(
-              login_modal_widget->GetNativeView()));
+                                kShellWindowId_LockSystemModalContainer)
+                ->layout_manager(),
+            controller->GetSystemModalLayoutManager(
+                login_modal_widget->GetNativeView()));
   login_modal_widget->Close();
 
   // Configure user session environment.
   SetUserLoggedIn(true);
   SetSessionStarted(true);
   EXPECT_EQ(user::LOGGED_IN_USER,
             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(),
-      internal::kShellWindowId_SystemModalContainer)->layout_manager(),
-          controller->GetSystemModalLayoutManager(NULL));
+                                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(),
-      internal::kShellWindowId_SystemModalContainer)->layout_manager(),
-          controller->GetSystemModalLayoutManager(
-              session_modal_widget->GetNativeView()));
+                                kShellWindowId_SystemModalContainer)
+                ->layout_manager(),
+            controller->GetSystemModalLayoutManager(
+                session_modal_widget->GetNativeView()));
 }
 
 TEST_F(RootWindowControllerTest, ModalContainerBlockedSession) {
   UpdateDisplay("600x600");
   Shell* shell = Shell::GetInstance();
-  internal::RootWindowController* controller =
-      shell->GetPrimaryRootWindowController();
-  aura::Window* lock_container =
-      Shell::GetContainer(controller->root_window(),
-                          internal::kShellWindowId_LockScreenContainer);
+  RootWindowController* controller = shell->GetPrimaryRootWindowController();
+  aura::Window* lock_container = Shell::GetContainer(
+      controller->root_window(), 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(),
-        internal::kShellWindowId_SystemModalContainer)->layout_manager(),
-            controller->GetSystemModalLayoutManager(
-                session_modal_widget->GetNativeView()));
+                                  kShellWindowId_SystemModalContainer)
+                  ->layout_manager(),
+              controller->GetSystemModalLayoutManager(
+                  session_modal_widget->GetNativeView()));
     EXPECT_EQ(Shell::GetContainer(controller->root_window(),
-        internal::kShellWindowId_SystemModalContainer)->layout_manager(),
-            controller->GetSystemModalLayoutManager(NULL));
+                                  kShellWindowId_SystemModalContainer)
+                  ->layout_manager(),
+              controller->GetSystemModalLayoutManager(NULL));
     session_modal_widget->Close();
 
     BlockUserSession(static_cast<UserSessionBlockReason>(block_reason));
 
     EXPECT_EQ(Shell::GetContainer(controller->root_window(),
-        internal::kShellWindowId_LockSystemModalContainer)->layout_manager(),
-            controller->GetSystemModalLayoutManager(NULL));
+                                  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(),
-        internal::kShellWindowId_LockSystemModalContainer)->layout_manager(),
+                                  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(),
-        internal::kShellWindowId_SystemModalContainer)->layout_manager(),
-            controller->GetSystemModalLayoutManager(
-                session_modal_widget->GetNativeView()));
+                                  kShellWindowId_SystemModalContainer)
+                  ->layout_manager(),
+              controller->GetSystemModalLayoutManager(
+                  session_modal_widget->GetNativeView()));
     session_modal_widget->Close();
 
     lock_modal_widget->Close();
     UnblockUserSession();
   }
 }
 
 TEST_F(RootWindowControllerTest, GetWindowForFullscreenMode) {
   UpdateDisplay("600x600");
-  internal::RootWindowController* controller =
+  RootWindowController* controller =
       Shell::GetInstance()->GetPrimaryRootWindowController();
 
   Widget* w1 = CreateTestWidget(gfx::Rect(0, 0, 100, 100));
   w1->Maximize();
   Widget* w2 = CreateTestWidget(gfx::Rect(0, 0, 100, 100));
   w2->SetFullscreen(true);
   // |w3| is a transient child of |w2|.
   Widget* w3 = Widget::CreateWindowWithParentAndBounds(NULL,
       w2->GetNativeWindow(), gfx::Rect(0, 0, 100, 100));
 
@@ skipping 51 matching lines @@
   w3->Activate();
   EXPECT_EQ(w2->GetNativeWindow(),
             controllers[0]->GetWindowForFullscreenMode());
   EXPECT_EQ(NULL, controllers[1]->GetWindowForFullscreenMode());
 }
 
 // Test that user session window can't be focused if user session blocked by
 // some overlapping UI.
 TEST_F(RootWindowControllerTest, FocusBlockedWindow) {
   UpdateDisplay("600x600");
-  internal::RootWindowController* controller =
+  RootWindowController* controller =
       Shell::GetInstance()->GetPrimaryRootWindowController();
-  aura::Window* lock_container =
-      Shell::GetContainer(controller->root_window(),
-                          internal::kShellWindowId_LockScreenContainer);
+  aura::Window* lock_container = Shell::GetContainer(
+      controller->root_window(), kShellWindowId_LockScreenContainer);
   aura::Window* lock_window = Widget::CreateWindowWithParentAndBounds(NULL,
       lock_container, gfx::Rect(0, 0, 100, 100))->GetNativeView();
   lock_window->Show();
   aura::Window* session_window =
       CreateTestWidget(gfx::Rect(0, 0, 100, 100))->GetNativeView();
   session_window->Show();
 
   for (int block_reason = FIRST_BLOCK_REASON;
        block_reason < NUMBER_OF_BLOCK_REASONS;
        ++block_reason) {
@@ skipping 114 matching lines @@
     return;
 
   UpdateDisplay("500x500,500x500");
 
   aura::Window::Windows root_windows = Shell::GetAllRootWindows();
   aura::Window* primary_root_window = Shell::GetPrimaryRootWindow();
   aura::Window* secondary_root_window =
       root_windows[0] == primary_root_window ?
           root_windows[1] : root_windows[0];
 
-  ASSERT_TRUE(Shell::GetContainer(
-      primary_root_window,
-      internal::kShellWindowId_VirtualKeyboardContainer));
-  ASSERT_FALSE(Shell::GetContainer(
-      secondary_root_window,
-      internal::kShellWindowId_VirtualKeyboardContainer));
+  ASSERT_TRUE(Shell::GetContainer(primary_root_window,
+                                  kShellWindowId_VirtualKeyboardContainer));
+  ASSERT_FALSE(Shell::GetContainer(secondary_root_window,
+                                   kShellWindowId_VirtualKeyboardContainer));
 }
 
 // Test for http://crbug.com/263599. Virtual keyboard should be able to receive
 // events at blocked user session.
 TEST_F(VirtualKeyboardRootWindowControllerTest,
        ClickVirtualKeyboardInBlockedWindow) {
   aura::Window* root_window = Shell::GetPrimaryRootWindow();
-  aura::Window* keyboard_container = Shell::GetContainer(root_window,
-      internal::kShellWindowId_VirtualKeyboardContainer);
+  aura::Window* keyboard_container =
+      Shell::GetContainer(root_window, kShellWindowId_VirtualKeyboardContainer);
   ASSERT_TRUE(keyboard_container);
   keyboard_container->Show();
 
   aura::Window* keyboard_window = Shell::GetInstance()->keyboard_controller()->
       proxy()->GetKeyboardWindow();
   keyboard_container->AddChild(keyboard_window);
   keyboard_window->set_owned_by_parent(false);
   keyboard_window->SetBounds(gfx::Rect());
   keyboard_window->Show();
 
@@ skipping 15 matching lines @@
     UnblockUserSession();
   }
 }
 
 // Test for http://crbug.com/299787. RootWindowController should delete
 // the old container since the keyboard controller creates a new window in
 // GetWindowContainer().
 TEST_F(VirtualKeyboardRootWindowControllerTest,
        DeleteOldContainerOnVirtualKeyboardInit) {
   aura::Window* root_window = Shell::GetPrimaryRootWindow();
-  aura::Window* keyboard_container = Shell::GetContainer(root_window,
-      internal::kShellWindowId_VirtualKeyboardContainer);
+  aura::Window* keyboard_container =
+      Shell::GetContainer(root_window, kShellWindowId_VirtualKeyboardContainer);
   ASSERT_TRUE(keyboard_container);
   // Track the keyboard container window.
   aura::WindowTracker tracker;
   tracker.Add(keyboard_container);
   // Mock a login user profile change to reinitialize the keyboard.
   ash::Shell::GetInstance()->OnLoginUserProfilePrepared();
   // keyboard_container should no longer be present.
   EXPECT_FALSE(tracker.Contains(keyboard_container));
 }
 
 // Test for crbug.com/342524. After user login, the work space should restore to
 // full screen.
 TEST_F(VirtualKeyboardRootWindowControllerTest, RestoreWorkspaceAfterLogin) {
   aura::Window* root_window = Shell::GetPrimaryRootWindow();
-  aura::Window* keyboard_container = Shell::GetContainer(root_window,
-      internal::kShellWindowId_VirtualKeyboardContainer);
+  aura::Window* keyboard_container =
+      Shell::GetContainer(root_window, kShellWindowId_VirtualKeyboardContainer);
   keyboard_container->Show();
   keyboard::KeyboardController* controller =
       Shell::GetInstance()->keyboard_controller();
   aura::Window* keyboard_window = controller->proxy()->GetKeyboardWindow();
   keyboard_container->AddChild(keyboard_window);
   keyboard_window->set_owned_by_parent(false);
   keyboard_window->Show();
 
   gfx::Rect before = ash::Shell::GetScreen()->GetPrimaryDisplay().work_area();
 
   // Notify keyboard bounds changing.
   controller->NotifyKeyboardBoundsChanging(
       controller->proxy()->GetKeyboardWindow()->bounds());
 
   gfx::Rect after = ash::Shell::GetScreen()->GetPrimaryDisplay().work_area();
   EXPECT_LT(after, before);
 
   // Mock a login user profile change to reinitialize the keyboard.
   ash::Shell::GetInstance()->OnLoginUserProfilePrepared();
   EXPECT_EQ(ash::Shell::GetScreen()->GetPrimaryDisplay().work_area(), before);
 }
 
 // Ensure that system modal dialogs do not block events targeted at the virtual
 // keyboard.
 TEST_F(VirtualKeyboardRootWindowControllerTest, ClickWithActiveModalDialog) {
   aura::Window* root_window = Shell::GetPrimaryRootWindow();
-  aura::Window* keyboard_container = Shell::GetContainer(root_window,
-      internal::kShellWindowId_VirtualKeyboardContainer);
+  aura::Window* keyboard_container =
+      Shell::GetContainer(root_window, kShellWindowId_VirtualKeyboardContainer);
   ASSERT_TRUE(keyboard_container);
   keyboard_container->Show();
 
   aura::Window* keyboard_window = Shell::GetInstance()->keyboard_controller()->
       proxy()->GetKeyboardWindow();
   keyboard_container->AddChild(keyboard_window);
   keyboard_window->set_owned_by_parent(false);
   keyboard_window->SetBounds(gfx::Rect());
   keyboard_window->Show();
 
@@ skipping 17 matching lines @@
 
   modal_widget->Close();
 
   // Verify that mouse events are now unblocked to the root window.
   root_window_event_generator.ClickLeftButton();
   EXPECT_EQ(2, handler->num_mouse_events() / 2);
 }
 
 }  // namespace test
 }  // namespace ash