#include "ash/display/mouse_cursor_event_filter.h"
#include "ash/drag_drop/drag_drop_controller.h"
#include "ash/root_window_controller.h"
-#include "ash/session_state_delegate.h"
+#include "ash/session/session_state_delegate.h"
#include "ash/shelf/shelf.h"
#include "ash/shelf/shelf_layout_manager.h"
#include "ash/shelf/shelf_widget.h"
namespace {
aura::Window* GetDefaultContainer() {
- return Shell::GetContainer(
- Shell::GetPrimaryRootWindow(),
- internal::kShellWindowId_DefaultContainer);
+ return Shell::GetContainer(Shell::GetPrimaryRootWindow(),
+ kShellWindowId_DefaultContainer);
}
aura::Window* GetAlwaysOnTopContainer() {
- return Shell::GetContainer(
- Shell::GetPrimaryRootWindow(),
- internal::kShellWindowId_AlwaysOnTopContainer);
+ return Shell::GetContainer(Shell::GetPrimaryRootWindow(),
+ kShellWindowId_AlwaysOnTopContainer);
}
// Expect ALL the containers!
void ExpectAllContainers() {
aura::Window* root_window = Shell::GetPrimaryRootWindow();
+ EXPECT_TRUE(Shell::GetContainer(root_window,
+ kShellWindowId_DesktopBackgroundContainer));
+ EXPECT_TRUE(
+ Shell::GetContainer(root_window, kShellWindowId_DefaultContainer));
+ EXPECT_TRUE(
+ Shell::GetContainer(root_window, kShellWindowId_AlwaysOnTopContainer));
+ EXPECT_TRUE(Shell::GetContainer(root_window, kShellWindowId_PanelContainer));
+ EXPECT_TRUE(Shell::GetContainer(root_window, kShellWindowId_ShelfContainer));
+ EXPECT_TRUE(
+ Shell::GetContainer(root_window, kShellWindowId_SystemModalContainer));
EXPECT_TRUE(Shell::GetContainer(
- root_window, internal::kShellWindowId_DesktopBackgroundContainer));
+ root_window, kShellWindowId_LockScreenBackgroundContainer));
+ EXPECT_TRUE(
+ Shell::GetContainer(root_window, kShellWindowId_LockScreenContainer));
+ EXPECT_TRUE(Shell::GetContainer(root_window,
+ kShellWindowId_LockSystemModalContainer));
+ EXPECT_TRUE(Shell::GetContainer(root_window, kShellWindowId_StatusContainer));
+ EXPECT_TRUE(Shell::GetContainer(root_window, kShellWindowId_MenuContainer));
+ EXPECT_TRUE(Shell::GetContainer(root_window,
+ kShellWindowId_DragImageAndTooltipContainer));
+ EXPECT_TRUE(
+ Shell::GetContainer(root_window, kShellWindowId_SettingBubbleContainer));
+ EXPECT_TRUE(
+ Shell::GetContainer(root_window, kShellWindowId_OverlayContainer));
EXPECT_TRUE(Shell::GetContainer(
- root_window, internal::kShellWindowId_DefaultContainer));
- EXPECT_TRUE(Shell::GetContainer(
- root_window, internal::kShellWindowId_AlwaysOnTopContainer));
- EXPECT_TRUE(Shell::GetContainer(
- root_window, internal::kShellWindowId_PanelContainer));
- EXPECT_TRUE(Shell::GetContainer(
- root_window, internal::kShellWindowId_ShelfContainer));
- EXPECT_TRUE(Shell::GetContainer(
- root_window, internal::kShellWindowId_SystemModalContainer));
- EXPECT_TRUE(Shell::GetContainer(
- root_window, internal::kShellWindowId_LockScreenBackgroundContainer));
- EXPECT_TRUE(Shell::GetContainer(
- root_window, internal::kShellWindowId_LockScreenContainer));
- EXPECT_TRUE(Shell::GetContainer(
- root_window, internal::kShellWindowId_LockSystemModalContainer));
- EXPECT_TRUE(Shell::GetContainer(
- root_window, internal::kShellWindowId_StatusContainer));
- EXPECT_TRUE(Shell::GetContainer(
- root_window, internal::kShellWindowId_MenuContainer));
- EXPECT_TRUE(Shell::GetContainer(
- root_window, internal::kShellWindowId_DragImageAndTooltipContainer));
- EXPECT_TRUE(Shell::GetContainer(
- root_window, internal::kShellWindowId_SettingBubbleContainer));
- EXPECT_TRUE(Shell::GetContainer(
- root_window, internal::kShellWindowId_OverlayContainer));
- EXPECT_TRUE(Shell::GetContainer(
- root_window, internal::kShellWindowId_VirtualKeyboardParentContainer));
+ root_window, kShellWindowId_VirtualKeyboardParentContainer));
#if defined(OS_CHROMEOS)
- EXPECT_TRUE(Shell::GetContainer(
- root_window, internal::kShellWindowId_MouseCursorContainer));
+ EXPECT_TRUE(
+ Shell::GetContainer(root_window, kShellWindowId_MouseCursorContainer));
#endif
}
Shell::GetInstance()->session_state_delegate();
delegate->LockScreen();
views::Widget* lock_widget = CreateTestWindow(widget_params);
- ash::Shell::GetContainer(
- Shell::GetPrimaryRootWindow(),
- ash::internal::kShellWindowId_LockScreenContainer)->
- AddChild(lock_widget->GetNativeView());
+ ash::Shell::GetContainer(Shell::GetPrimaryRootWindow(),
+ ash::kShellWindowId_LockScreenContainer)
+ ->AddChild(lock_widget->GetNativeView());
lock_widget->Show();
EXPECT_TRUE(delegate->IsScreenLocked());
EXPECT_TRUE(lock_widget->GetNativeView()->HasFocus());
// It should be in modal container.
aura::Window* modal_container = Shell::GetContainer(
- Shell::GetPrimaryRootWindow(),
- internal::kShellWindowId_SystemModalContainer);
+ Shell::GetPrimaryRootWindow(), kShellWindowId_SystemModalContainer);
EXPECT_EQ(modal_container, modal_widget->GetNativeWindow()->parent());
modal_widget->Close();
Shell::GetInstance()->session_state_delegate()->LockScreen();
// Create a LockScreen window.
views::Widget* lock_widget = CreateTestWindow(widget_params);
- ash::Shell::GetContainer(
- Shell::GetPrimaryRootWindow(),
- ash::internal::kShellWindowId_LockScreenContainer)->
- AddChild(lock_widget->GetNativeView());
+ ash::Shell::GetContainer(Shell::GetPrimaryRootWindow(),
+ ash::kShellWindowId_LockScreenContainer)
+ ->AddChild(lock_widget->GetNativeView());
lock_widget->Show();
EXPECT_TRUE(lock_widget->GetNativeView()->HasFocus());
// It should be in LockScreen container.
aura::Window* lock_screen = Shell::GetContainer(
- Shell::GetPrimaryRootWindow(),
- ash::internal::kShellWindowId_LockScreenContainer);
+ Shell::GetPrimaryRootWindow(), ash::kShellWindowId_LockScreenContainer);
EXPECT_EQ(lock_screen, lock_widget->GetNativeWindow()->parent());
// Create a modal window with a lock window as parent.
EXPECT_TRUE(lock_modal_widget->GetNativeView()->HasFocus());
// It should be in LockScreen modal container.
- aura::Window* lock_modal_container = Shell::GetContainer(
- Shell::GetPrimaryRootWindow(),
- ash::internal::kShellWindowId_LockSystemModalContainer);
+ aura::Window* lock_modal_container =
+ Shell::GetContainer(Shell::GetPrimaryRootWindow(),
+ ash::kShellWindowId_LockSystemModalContainer);
EXPECT_EQ(lock_modal_container,
lock_modal_widget->GetNativeWindow()->parent());
// It should be in non-LockScreen modal container.
aura::Window* modal_container = Shell::GetContainer(
- Shell::GetPrimaryRootWindow(),
- ash::internal::kShellWindowId_SystemModalContainer);
+ Shell::GetPrimaryRootWindow(), ash::kShellWindowId_SystemModalContainer);
EXPECT_EQ(modal_container, modal_widget->GetNativeWindow()->parent());
// Modal dialog without parent, caused crash see crbug.com/226141
base::Unretained(this)));
EXPECT_EQ(views::MenuRunner::NORMAL_EXIT,
- menu_runner->RunMenuAt(widget, NULL, gfx::Rect(),
- views::MenuItemView::TOPLEFT, ui::MENU_SOURCE_MOUSE,
- views::MenuRunner::CONTEXT_MENU));
+ menu_runner->RunMenuAt(widget,
+ NULL,
+ gfx::Rect(),
+ views::MENU_ANCHOR_TOPLEFT,
+ ui::MENU_SOURCE_MOUSE,
+ views::MenuRunner::CONTEXT_MENU));
}
TEST_F(ShellTest, ManagedWindowModeBasics) {
shelf_widget->GetWindowBoundsInScreen().bottom());
// We have a desktop background but not a bare layer.
// TODO (antrim): enable once we find out why it fails component build.
- // internal::DesktopBackgroundWidgetController* background =
+ // DesktopBackgroundWidgetController* background =
// Shell::GetPrimaryRootWindow()->
- // GetProperty(internal::kWindowDesktopComponent);
+ // GetProperty(kWindowDesktopComponent);
// EXPECT_TRUE(background);
// EXPECT_TRUE(background->widget());
// EXPECT_FALSE(background->layer());