#include "ui/wm/core/window_util.h"
namespace ash {
-namespace internal {
class DockedWindowResizerTest
: public test::AshTestBase,
test::TestShelfDelegate* shelf_delegate =
test::TestShelfDelegate::instance();
shelf_delegate->AddShelfItem(window);
- PanelLayoutManager* manager =
- static_cast<PanelLayoutManager*>(
- Shell::GetContainer(window->GetRootWindow(),
- internal::kShellWindowId_PanelContainer)->
- layout_manager());
+ PanelLayoutManager* manager = static_cast<PanelLayoutManager*>(
+ Shell::GetContainer(window->GetRootWindow(),
+ kShellWindowId_PanelContainer)->layout_manager());
manager->Relayout();
}
return window;
// during drags.
int CorrectContainerIdDuringDrag() {
if (window_type_ == ui::wm::WINDOW_TYPE_PANEL)
- return internal::kShellWindowId_PanelContainer;
- return internal::kShellWindowId_DockedContainer;
+ return kShellWindowId_PanelContainer;
+ return kShellWindowId_DockedContainer;
}
// Test dragging the window vertically (to detach if it is a panel) and then
// x-coordinate can get adjusted by snapping or sticking.
// y-coordinate could be changed by possible automatic layout if docked.
- if (window->parent()->id() != internal::kShellWindowId_DockedContainer &&
+ if (window->parent()->id() != kShellWindowId_DockedContainer &&
!wm::GetWindowState(window)->HasRestoreBounds()) {
EXPECT_EQ(initial_bounds.y() + dy, window->GetBoundsInScreen().y());
}
// The window should be docked at the right edge.
EXPECT_EQ(window->GetRootWindow()->GetBoundsInScreen().right(),
window->GetBoundsInScreen().right());
- EXPECT_EQ(internal::kShellWindowId_DockedContainer, window->parent()->id());
+ EXPECT_EQ(kShellWindowId_DockedContainer, window->parent()->id());
}
// Verifies a window can be dragged and attached to the dock
// The window should be docked at the right edge.
EXPECT_EQ(window->GetRootWindow()->GetBoundsInScreen().right(),
window->GetBoundsInScreen().right());
- EXPECT_EQ(internal::kShellWindowId_DockedContainer, window->parent()->id());
+ EXPECT_EQ(kShellWindowId_DockedContainer, window->parent()->id());
}
// Verifies a window can be dragged and then if a pointer is not quite reaching
EXPECT_EQ(window->GetRootWindow()->GetBoundsInScreen().right() +
window->bounds().width() - kGrabOffsetX - kUndershootBy - 1,
window->GetBoundsInScreen().right());
- EXPECT_EQ(internal::kShellWindowId_DefaultContainer,
- window->parent()->id());
+ EXPECT_EQ(kShellWindowId_DefaultContainer, window->parent()->id());
}
// Verifies a window can be dragged and attached to the dock.
// The window should be docked at the left edge.
EXPECT_EQ(window->GetRootWindow()->GetBoundsInScreen().x(),
window->GetBoundsInScreen().x());
- EXPECT_EQ(internal::kShellWindowId_DockedContainer, window->parent()->id());
+ EXPECT_EQ(kShellWindowId_DockedContainer, window->parent()->id());
}
// Verifies a window can be dragged and attached to the dock
// The window should be docked at the left edge.
EXPECT_EQ(window->GetRootWindow()->GetBoundsInScreen().x(),
window->GetBoundsInScreen().x());
- EXPECT_EQ(internal::kShellWindowId_DockedContainer, window->parent()->id());
+ EXPECT_EQ(kShellWindowId_DockedContainer, window->parent()->id());
}
// Verifies a window can be dragged and then if a pointer is not quite reaching
// The window should be crossing the screen edge but not docked.
int expected_x = initial_bounds.x() - initial_location_in_parent().x() + 1;
EXPECT_EQ(expected_x, window->GetBoundsInScreen().x());
- EXPECT_EQ(internal::kShellWindowId_DefaultContainer,
- window->parent()->id());
+ EXPECT_EQ(kShellWindowId_DefaultContainer, window->parent()->id());
}
// Dock on the right side, change shelf alignment, check that windows move to
// The window should be docked at the right edge.
EXPECT_EQ(window->GetRootWindow()->GetBoundsInScreen().right(),
window->GetBoundsInScreen().right());
- EXPECT_EQ(internal::kShellWindowId_DockedContainer, window->parent()->id());
+ EXPECT_EQ(kShellWindowId_DockedContainer, window->parent()->id());
// set launcher shelf to be aligned on the right
ash::Shell* shell = ash::Shell::GetInstance();
// The window should have moved and get attached to the left dock.
EXPECT_EQ(window->GetRootWindow()->GetBoundsInScreen().x(),
window->GetBoundsInScreen().x());
- EXPECT_EQ(internal::kShellWindowId_DockedContainer, window->parent()->id());
+ EXPECT_EQ(kShellWindowId_DockedContainer, window->parent()->id());
// set launcher shelf to be aligned on the left
shell->SetShelfAlignment(SHELF_ALIGNMENT_LEFT,
// The window should have moved and get attached to the right edge.
EXPECT_EQ(window->GetRootWindow()->GetBoundsInScreen().right(),
window->GetBoundsInScreen().right());
- EXPECT_EQ(internal::kShellWindowId_DockedContainer, window->parent()->id());
+ EXPECT_EQ(kShellWindowId_DockedContainer, window->parent()->id());
// set launcher shelf to be aligned at the bottom
shell->SetShelfAlignment(SHELF_ALIGNMENT_BOTTOM,
// The window should stay in the right edge.
EXPECT_EQ(window->GetRootWindow()->GetBoundsInScreen().right(),
window->GetBoundsInScreen().right());
- EXPECT_EQ(internal::kShellWindowId_DockedContainer, window->parent()->id());
+ EXPECT_EQ(kShellWindowId_DockedContainer, window->parent()->id());
}
// Dock on the right side, try to undock, then drag more to really undock
EXPECT_EQ(window->GetRootWindow()->GetBoundsInScreen().right(),
window->GetBoundsInScreen().right());
EXPECT_EQ(ideal_width(), window->GetBoundsInScreen().width());
- EXPECT_EQ(internal::kShellWindowId_DockedContainer, window->parent()->id());
+ EXPECT_EQ(kShellWindowId_DockedContainer, window->parent()->id());
// Try to detach by dragging left less than kSnapToDockDistance.
// The window should stay docked.
// The window should be still attached to the right edge.
EXPECT_EQ(window->GetRootWindow()->GetBoundsInScreen().right(),
window->GetBoundsInScreen().right());
- EXPECT_EQ(internal::kShellWindowId_DockedContainer, window->parent()->id());
+ EXPECT_EQ(kShellWindowId_DockedContainer, window->parent()->id());
// Try to detach by dragging left by kSnapToDockDistance or more.
// The window should get undocked.
// The window should be floating on the desktop again and moved to the left.
EXPECT_EQ(left_edge - 32, window->GetBoundsInScreen().x());
- EXPECT_EQ(internal::kShellWindowId_DefaultContainer,
- window->parent()->id());
+ EXPECT_EQ(kShellWindowId_DefaultContainer, window->parent()->id());
}
// Dock on the right side, and undock by dragging the right edge of the window
EXPECT_EQ(window->GetRootWindow()->GetBoundsInScreen().right(),
window->GetBoundsInScreen().right());
EXPECT_EQ(ideal_width(), window->GetBoundsInScreen().width());
- EXPECT_EQ(internal::kShellWindowId_DockedContainer, window->parent()->id());
+ EXPECT_EQ(kShellWindowId_DockedContainer, window->parent()->id());
// Try to detach by dragging left less than kSnapToDockDistance.
// The window should stay docked.
// The window should be still attached to the right edge.
EXPECT_EQ(window->GetRootWindow()->GetBoundsInScreen().right(),
window->GetBoundsInScreen().right());
- EXPECT_EQ(internal::kShellWindowId_DockedContainer, window->parent()->id());
+ EXPECT_EQ(kShellWindowId_DockedContainer, window->parent()->id());
// Try to detach by dragging left by kSnapToDockDistance or more.
// The window should get undocked.
// The window should be floating on the desktop again and moved to the left.
EXPECT_EQ(left_edge - 32, window->GetBoundsInScreen().x());
- EXPECT_EQ(internal::kShellWindowId_DefaultContainer,
- window->parent()->id());
+ EXPECT_EQ(kShellWindowId_DefaultContainer, window->parent()->id());
}
// Minimize a docked window, then restore it and check that it is still docked.
// The window should be docked at the right edge.
EXPECT_EQ(window->GetRootWindow()->GetBoundsInScreen().right(),
window->GetBoundsInScreen().right());
- EXPECT_EQ(internal::kShellWindowId_DockedContainer, window->parent()->id());
+ EXPECT_EQ(kShellWindowId_DockedContainer, window->parent()->id());
wm::WindowState* window_state = wm::GetWindowState(window.get());
// Minimize the window, it should be hidden.
// The window should be docked at the right edge.
EXPECT_EQ(window->GetRootWindow()->GetBoundsInScreen().right(),
window->GetBoundsInScreen().right());
- EXPECT_EQ(internal::kShellWindowId_DockedContainer, window->parent()->id());
+ EXPECT_EQ(kShellWindowId_DockedContainer, window->parent()->id());
wm::WindowState* window_state = wm::GetWindowState(window.get());
// Maximize the window, it should get undocked and maximized in a desktop.
RunAllPendingInMessageLoop();
EXPECT_TRUE(window->IsVisible());
EXPECT_TRUE(window_state->IsMaximized());
- EXPECT_EQ(internal::kShellWindowId_DefaultContainer, window->parent()->id());
+ EXPECT_EQ(kShellWindowId_DefaultContainer, window->parent()->id());
}
// Dock two windows, undock one, check that the other one is still docked.
// Both windows should be docked at the right edge.
EXPECT_EQ(w1->GetRootWindow()->GetBoundsInScreen().right(),
w1->GetBoundsInScreen().right());
- EXPECT_EQ(internal::kShellWindowId_DockedContainer, w1->parent()->id());
+ EXPECT_EQ(kShellWindowId_DockedContainer, w1->parent()->id());
EXPECT_EQ(w2->GetRootWindow()->GetBoundsInScreen().right(),
w2->GetBoundsInScreen().right());
- EXPECT_EQ(internal::kShellWindowId_DockedContainer, w2->parent()->id());
+ EXPECT_EQ(kShellWindowId_DockedContainer, w2->parent()->id());
// Detach by dragging left (should get undocked).
const int left_edge = w2->bounds().x();
EXPECT_FALSE(window_state1->IsMinimized());
EXPECT_EQ(w1->GetRootWindow()->GetBoundsInScreen().right(),
w1->GetBoundsInScreen().right());
- EXPECT_EQ(internal::kShellWindowId_DockedContainer, w1->parent()->id());
+ EXPECT_EQ(kShellWindowId_DockedContainer, w1->parent()->id());
// The window should be floating on the desktop again and moved to the left.
EXPECT_EQ(left_edge - 32, w2->GetBoundsInScreen().x());
- EXPECT_EQ(internal::kShellWindowId_DefaultContainer,
- w2->parent()->id());
+ EXPECT_EQ(kShellWindowId_DefaultContainer, w2->parent()->id());
}
// Create two windows, dock one and change shelf to auto-hide.
// w1 should be docked at the right edge.
EXPECT_EQ(w1->GetRootWindow()->GetBoundsInScreen().right(),
w1->GetBoundsInScreen().right());
- EXPECT_EQ(internal::kShellWindowId_DockedContainer, w1->parent()->id());
+ EXPECT_EQ(kShellWindowId_DockedContainer, w1->parent()->id());
scoped_ptr<aura::Window> w2(CreateTestWindowInShellWithDelegateAndType(
NULL, ui::wm::WINDOW_TYPE_NORMAL, 0, gfx::Rect(20, 20, 150, 20)));
wm::GetWindowState(w2.get())->Maximize();
- EXPECT_EQ(internal::kShellWindowId_DefaultContainer, w2->parent()->id());
+ EXPECT_EQ(kShellWindowId_DefaultContainer, w2->parent()->id());
EXPECT_TRUE(wm::GetWindowState(w2.get())->IsMaximized());
gfx::Rect work_area =
// The first window should be docked at the right edge.
EXPECT_EQ(w1->GetRootWindow()->GetBoundsInScreen().right(),
w1->GetBoundsInScreen().right());
- EXPECT_EQ(internal::kShellWindowId_DockedContainer, w1->parent()->id());
+ EXPECT_EQ(kShellWindowId_DockedContainer, w1->parent()->id());
// The second window should be near the left edge but not snapped.
// Normal window will get side-maximized while panels will not.
int expected_x = test_panels() ?
(initial_bounds.x() - initial_location_in_parent().x()) : 0;
EXPECT_EQ(expected_x, w2->GetBoundsInScreen().x());
- EXPECT_EQ(internal::kShellWindowId_DefaultContainer, w2->parent()->id());
+ EXPECT_EQ(kShellWindowId_DefaultContainer, w2->parent()->id());
}
// Tests that reverting a drag restores docked state if a window was docked.
// The window should be docked at the right edge.
EXPECT_EQ(window->GetRootWindow()->GetBoundsInScreen().right(),
window->GetBoundsInScreen().right());
- EXPECT_EQ(internal::kShellWindowId_DockedContainer, window->parent()->id());
+ EXPECT_EQ(kShellWindowId_DockedContainer, window->parent()->id());
// Drag the window out but revert the drag
ASSERT_NO_FATAL_FAILURE(DragStart(window.get()));
DragMove(-50, 0);
DragRevert();
- EXPECT_EQ(internal::kShellWindowId_DockedContainer, window->parent()->id());
+ EXPECT_EQ(kShellWindowId_DockedContainer, window->parent()->id());
// Detach window.
ASSERT_NO_FATAL_FAILURE(DragStart(window.get()));
DragMove(-50, 0);
DragEnd();
- EXPECT_EQ(internal::kShellWindowId_DefaultContainer,
- window->parent()->id());
+ EXPECT_EQ(kShellWindowId_DefaultContainer, window->parent()->id());
}
// Tests that reverting drag restores undocked state if a window was not docked.
// The window should be docked at the right edge.
EXPECT_EQ(window->GetRootWindow()->GetBoundsInScreen().right(),
window->GetBoundsInScreen().right());
- EXPECT_EQ(internal::kShellWindowId_DockedContainer, window->parent()->id());
+ EXPECT_EQ(kShellWindowId_DockedContainer, window->parent()->id());
// Try dragging to the right - enough to get it peeking at the other screen
// but not enough to land in the other screen.
DragEnd();
EXPECT_EQ(window->GetRootWindow()->GetBoundsInScreen().right(),
window->GetBoundsInScreen().right());
- EXPECT_EQ(internal::kShellWindowId_DockedContainer,
- window->parent()->id());
+ EXPECT_EQ(kShellWindowId_DockedContainer, window->parent()->id());
EXPECT_EQ(root_windows[0], window->GetRootWindow());
// Undock and move to the right - enough to get the mouse pointer past the
DragEnd();
EXPECT_NE(window->GetRootWindow()->GetBoundsInScreen().right(),
window->GetBoundsInScreen().right());
- EXPECT_EQ(internal::kShellWindowId_DefaultContainer,
- window->parent()->id());
+ EXPECT_EQ(kShellWindowId_DefaultContainer, window->parent()->id());
EXPECT_EQ(root_windows[1], window->GetRootWindow());
// Keep dragging it to the right until its left edge touches the screen edge.
DragEnd();
EXPECT_EQ(window->GetRootWindow()->GetBoundsInScreen().x(),
window->GetBoundsInScreen().x());
- EXPECT_EQ(internal::kShellWindowId_DefaultContainer, window->parent()->id());
+ EXPECT_EQ(kShellWindowId_DefaultContainer, window->parent()->id());
EXPECT_EQ(root_windows[1], window->GetRootWindow());
}
// A window should be docked at the right edge.
EXPECT_EQ(w1->GetRootWindow()->GetBoundsInScreen().right(),
w1->GetBoundsInScreen().right());
- EXPECT_EQ(internal::kShellWindowId_DockedContainer, w1->parent()->id());
+ EXPECT_EQ(kShellWindowId_DockedContainer, w1->parent()->id());
DockedWindowLayoutManager* manager =
static_cast<DockedWindowLayoutManager*>(w1->parent()->layout_manager());
EXPECT_EQ(DOCKED_ALIGNMENT_RIGHT, docked_alignment(manager));
// Both windows should now be docked at the right edge.
EXPECT_EQ(w2->GetRootWindow()->GetBoundsInScreen().right(),
w2->GetBoundsInScreen().right());
- EXPECT_EQ(internal::kShellWindowId_DockedContainer, w2->parent()->id());
+ EXPECT_EQ(kShellWindowId_DockedContainer, w2->parent()->id());
// Dock width should be set to a wider window.
EXPECT_EQ(DOCKED_ALIGNMENT_RIGHT, docked_alignment(manager));
EXPECT_EQ(std::max(w1->bounds().width(), w2->bounds().width()),
// The first window should be still docked.
EXPECT_EQ(w1->GetRootWindow()->GetBoundsInScreen().right(),
w1->GetBoundsInScreen().right());
- EXPECT_EQ(internal::kShellWindowId_DockedContainer, w1->parent()->id());
+ EXPECT_EQ(kShellWindowId_DockedContainer, w1->parent()->id());
// The second window should be still docked.
EXPECT_EQ(w2->GetRootWindow()->GetBoundsInScreen().right(),
w2->GetBoundsInScreen().right());
- EXPECT_EQ(internal::kShellWindowId_DockedContainer, w2->parent()->id());
+ EXPECT_EQ(kShellWindowId_DockedContainer, w2->parent()->id());
// Detach by dragging left more (should get undocked).
const int left_edge = w2->bounds().x();
// The second window should be floating on the desktop again.
EXPECT_EQ(left_edge + drag_x, w2->bounds().x());
- EXPECT_EQ(internal::kShellWindowId_DefaultContainer, w2->parent()->id());
+ EXPECT_EQ(kShellWindowId_DefaultContainer, w2->parent()->id());
// Dock width should be set to remaining single docked window.
- EXPECT_EQ(internal::kShellWindowId_DockedContainer, w1->parent()->id());
+ EXPECT_EQ(kShellWindowId_DockedContainer, w1->parent()->id());
EXPECT_EQ(DOCKED_ALIGNMENT_RIGHT, docked_alignment(manager));
EXPECT_EQ(w1->bounds().width(), docked_width(manager));
}
// A window should be docked at the right edge.
EXPECT_EQ(w1->GetRootWindow()->GetBoundsInScreen().right(),
w1->GetBoundsInScreen().right());
- EXPECT_EQ(internal::kShellWindowId_DockedContainer, w1->parent()->id());
+ EXPECT_EQ(kShellWindowId_DockedContainer, w1->parent()->id());
DockedWindowLayoutManager* manager =
static_cast<DockedWindowLayoutManager*>(w1->parent()->layout_manager());
EXPECT_EQ(DOCKED_ALIGNMENT_RIGHT, docked_alignment(manager));
// The first window should be still docked.
EXPECT_EQ(w1->GetRootWindow()->GetBoundsInScreen().right(),
w1->GetBoundsInScreen().right());
- EXPECT_EQ(internal::kShellWindowId_DockedContainer, w1->parent()->id());
+ EXPECT_EQ(kShellWindowId_DockedContainer, w1->parent()->id());
// The second window should be floating on the desktop.
EXPECT_EQ(w2->GetRootWindow()->GetBoundsInScreen().right() -
(w2->bounds().width()/2 + 20),
w2->GetBoundsInScreen().right());
- EXPECT_EQ(internal::kShellWindowId_DefaultContainer, w2->parent()->id());
+ EXPECT_EQ(kShellWindowId_DefaultContainer, w2->parent()->id());
// Dock width should be set to remaining single docked window.
- EXPECT_EQ(internal::kShellWindowId_DockedContainer, w1->parent()->id());
+ EXPECT_EQ(kShellWindowId_DockedContainer, w1->parent()->id());
EXPECT_EQ(DOCKED_ALIGNMENT_RIGHT, docked_alignment(manager));
EXPECT_EQ(w1->bounds().width(), docked_width(manager));
// Desktop work area should now shrink.
DragEnd();
EXPECT_EQ(DOCKED_ALIGNMENT_NONE, docked_alignment(manager));
// Dock should get shrunk and desktop should get expanded.
- EXPECT_EQ(internal::kShellWindowId_DefaultContainer, w1->parent()->id());
- EXPECT_EQ(internal::kShellWindowId_DefaultContainer, w2->parent()->id());
+ EXPECT_EQ(kShellWindowId_DefaultContainer, w1->parent()->id());
+ EXPECT_EQ(kShellWindowId_DefaultContainer, w2->parent()->id());
EXPECT_EQ(DOCKED_ALIGNMENT_NONE, docked_alignment(manager));
EXPECT_EQ(0, docked_width(manager));
// The second window should now get resized and take up the whole screen.
// Release the mouse and the window should be now attached to the edge.
DragEnd();
// Dock should get expanded and desktop should get shrunk.
- EXPECT_EQ(internal::kShellWindowId_DockedContainer, w1->parent()->id());
+ EXPECT_EQ(kShellWindowId_DockedContainer, w1->parent()->id());
EXPECT_EQ(DOCKED_ALIGNMENT_LEFT, docked_alignment(manager));
EXPECT_EQ(w1->bounds().width(), docked_width(manager));
// Second window should still be in the desktop.
- EXPECT_EQ(internal::kShellWindowId_DefaultContainer, w2->parent()->id());
+ EXPECT_EQ(kShellWindowId_DefaultContainer, w2->parent()->id());
// Maximized window should be shrunk.
EXPECT_EQ(ScreenUtil::GetDisplayBoundsInParent(w2.get()).width() -
docked_width(manager) - min_dock_gap(),
// A window should be docked at the left edge.
EXPECT_EQ(w1->GetRootWindow()->GetBoundsInScreen().x(),
w1->GetBoundsInScreen().x());
- EXPECT_EQ(internal::kShellWindowId_DockedContainer, w1->parent()->id());
+ EXPECT_EQ(kShellWindowId_DockedContainer, w1->parent()->id());
DockedWindowLayoutManager* manager =
static_cast<DockedWindowLayoutManager*>(w1->parent()->layout_manager());
// The first window should be docked.
EXPECT_EQ(w1->GetRootWindow()->GetBoundsInScreen().x(),
w1->GetBoundsInScreen().x());
// Dock width should be set to that of a single docked window.
- EXPECT_EQ(internal::kShellWindowId_DockedContainer, w1->parent()->id());
+ EXPECT_EQ(kShellWindowId_DockedContainer, w1->parent()->id());
EXPECT_EQ(DOCKED_ALIGNMENT_LEFT, docked_alignment(manager));
EXPECT_EQ(w1->bounds().width(), docked_width(manager));
EXPECT_EQ(w2->GetRootWindow()->GetBoundsInScreen().x() +
(w1->bounds().right() + 20),
w2->GetBoundsInScreen().x());
- EXPECT_EQ(internal::kShellWindowId_DefaultContainer, w2->parent()->id());
+ EXPECT_EQ(kShellWindowId_DefaultContainer, w2->parent()->id());
// Dock width should be set to that of a single docked window.
- EXPECT_EQ(internal::kShellWindowId_DockedContainer, w1->parent()->id());
+ EXPECT_EQ(kShellWindowId_DockedContainer, w1->parent()->id());
EXPECT_EQ(DOCKED_ALIGNMENT_LEFT, docked_alignment(manager));
EXPECT_EQ(w1->bounds().width(), docked_width(manager));
EXPECT_EQ(DOCKED_ALIGNMENT_LEFT, docked_alignment(manager));
EXPECT_EQ(w1->bounds().width(), docked_width(manager));
// The second window should still be in the desktop.
- EXPECT_EQ(internal::kShellWindowId_DockedContainer, w1->parent()->id());
- EXPECT_EQ(internal::kShellWindowId_DefaultContainer, w2->parent()->id());
+ EXPECT_EQ(kShellWindowId_DockedContainer, w1->parent()->id());
+ EXPECT_EQ(kShellWindowId_DefaultContainer, w2->parent()->id());
// Drag w2 by a bit more - it should resist the drag (stuck edges)
int start_x = w2->bounds().x();
EXPECT_EQ(DOCKED_ALIGNMENT_LEFT, docked_alignment(manager));
EXPECT_EQ(w1->bounds().width(), docked_width(manager));
// The second window should still be in the desktop
- EXPECT_EQ(internal::kShellWindowId_DockedContainer, w1->parent()->id());
- EXPECT_EQ(internal::kShellWindowId_DefaultContainer, w2->parent()->id());
+ EXPECT_EQ(kShellWindowId_DockedContainer, w1->parent()->id());
+ EXPECT_EQ(kShellWindowId_DefaultContainer, w2->parent()->id());
// Drag w2 by more than the stuck threshold and drop it into the dock.
ASSERT_NO_FATAL_FAILURE(DragStart(w2.get()));
// Release the mouse and the window should be attached to the edge.
DragEnd();
// Both windows are docked now.
- EXPECT_EQ(internal::kShellWindowId_DockedContainer, w1->parent()->id());
- EXPECT_EQ(internal::kShellWindowId_DockedContainer, w2->parent()->id());
+ EXPECT_EQ(kShellWindowId_DockedContainer, w1->parent()->id());
+ EXPECT_EQ(kShellWindowId_DockedContainer, w2->parent()->id());
// Dock should get expanded and desktop should get shrunk.
EXPECT_EQ(DOCKED_ALIGNMENT_LEFT, docked_alignment(manager));
EXPECT_EQ(std::max(w1->bounds().width(), w2->bounds().width()),
// A window should be docked at the right edge.
EXPECT_EQ(w1->GetRootWindow()->GetBoundsInScreen().right(),
w1->GetBoundsInScreen().right());
- EXPECT_EQ(internal::kShellWindowId_DockedContainer, w1->parent()->id());
+ EXPECT_EQ(kShellWindowId_DockedContainer, w1->parent()->id());
DockedWindowLayoutManager* manager =
static_cast<DockedWindowLayoutManager*>(w1->parent()->layout_manager());
EXPECT_EQ(DOCKED_ALIGNMENT_RIGHT, docked_alignment(manager));
// Both windows should now be docked at the right edge.
EXPECT_EQ(w2->GetRootWindow()->GetBoundsInScreen().right(),
w2->GetBoundsInScreen().right());
- EXPECT_EQ(internal::kShellWindowId_DockedContainer, w2->parent()->id());
+ EXPECT_EQ(kShellWindowId_DockedContainer, w2->parent()->id());
// Dock width should be set to a wider window.
EXPECT_EQ(DOCKED_ALIGNMENT_RIGHT, docked_alignment(manager));
EXPECT_EQ(std::max(w1->bounds().width(), w2->bounds().width()),
// Release the mouse and the window should be attached to the edge.
DragEnd();
// Dock should still have both windows in it.
- EXPECT_EQ(internal::kShellWindowId_DockedContainer, w1->parent()->id());
- EXPECT_EQ(internal::kShellWindowId_DockedContainer, w2->parent()->id());
+ EXPECT_EQ(kShellWindowId_DockedContainer, w1->parent()->id());
+ EXPECT_EQ(kShellWindowId_DockedContainer, w2->parent()->id());
EXPECT_EQ(DOCKED_ALIGNMENT_RIGHT, docked_alignment(manager));
// w1 is now wider than before. The dock should expand and be as wide as w1.
EXPECT_EQ(previous_width + kResizeSpan1, w1->bounds().width());
// Release the mouse and the window should be attached to the edge.
DragEnd();
// Dock should still have both windows in it.
- EXPECT_EQ(internal::kShellWindowId_DockedContainer, w1->parent()->id());
- EXPECT_EQ(internal::kShellWindowId_DockedContainer, w2->parent()->id());
+ EXPECT_EQ(kShellWindowId_DockedContainer, w1->parent()->id());
+ EXPECT_EQ(kShellWindowId_DockedContainer, w2->parent()->id());
EXPECT_EQ(DOCKED_ALIGNMENT_RIGHT, docked_alignment(manager));
// w1 is now as wide as the maximum dock width and the dock should get
// resized to the maximum width.
// Release the mouse and the window should be docked.
DragEnd();
// Dock should still have both windows in it.
- EXPECT_EQ(internal::kShellWindowId_DockedContainer, w1->parent()->id());
- EXPECT_EQ(internal::kShellWindowId_DockedContainer, w2->parent()->id());
+ EXPECT_EQ(kShellWindowId_DockedContainer, w1->parent()->id());
+ EXPECT_EQ(kShellWindowId_DockedContainer, w2->parent()->id());
EXPECT_EQ(DOCKED_ALIGNMENT_RIGHT, docked_alignment(manager));
// w1 should be narrower than before by the length of the drag.
EXPECT_EQ(previous_width - kResizeSpan3, w1->bounds().width());
DragMove(-kResizeSpan3, 0);
DragEnd();
EXPECT_EQ(previous_width + kResizeSpan3, w1->bounds().width());
- EXPECT_EQ(internal::kShellWindowId_DockedContainer, w1->parent()->id());
+ EXPECT_EQ(kShellWindowId_DockedContainer, w1->parent()->id());
// Docked area should be as wide as possible (maximum) and same as w1.
EXPECT_EQ(max_width(), docked_width(manager));
EXPECT_EQ(w1->bounds().width(), docked_width(manager));
EXPECT_EQ(DOCKED_ALIGNMENT_RIGHT, docked_alignment(manager));
// Release the mouse and the window should be no longer attached to the edge.
DragEnd();
- EXPECT_EQ(internal::kShellWindowId_DefaultContainer, w1->parent()->id());
+ EXPECT_EQ(kShellWindowId_DefaultContainer, w1->parent()->id());
// Dock should be as wide as w2 (and same as ideal width).
EXPECT_EQ(DOCKED_ALIGNMENT_RIGHT, docked_alignment(manager));
EXPECT_EQ(ideal_width(), docked_width(manager));
EXPECT_EQ(w2->bounds().width(), docked_width(manager));
// The second window should be still docked.
- EXPECT_EQ(internal::kShellWindowId_DockedContainer, w2->parent()->id());
+ EXPECT_EQ(kShellWindowId_DockedContainer, w2->parent()->id());
// Desktop work area should be inset.
EXPECT_EQ(ScreenUtil::GetDisplayBoundsInParent(w1.get()).width() -
docked_width(manager) - min_dock_gap(),
// Window should be docked at the right edge.
EXPECT_EQ(w1->GetRootWindow()->GetBoundsInScreen().right(),
w1->GetBoundsInScreen().right());
- EXPECT_EQ(internal::kShellWindowId_DockedContainer, w1->parent()->id());
+ EXPECT_EQ(kShellWindowId_DockedContainer, w1->parent()->id());
DockedWindowLayoutManager* manager =
static_cast<DockedWindowLayoutManager*>(w1->parent()->layout_manager());
EXPECT_EQ(DOCKED_ALIGNMENT_RIGHT, docked_alignment(manager));
// Release the mouse and the window should be attached to the edge.
DragEnd();
// The window should get docked.
- EXPECT_EQ(internal::kShellWindowId_DockedContainer, w1->parent()->id());
+ EXPECT_EQ(kShellWindowId_DockedContainer, w1->parent()->id());
EXPECT_EQ(DOCKED_ALIGNMENT_RIGHT, docked_alignment(manager));
// w1 is now wider and the dock should expand to be as wide as w1.
EXPECT_EQ(previous_width + kResizeSpan1, w1->bounds().width());
// Window should be docked at the right edge.
EXPECT_EQ(w1->GetRootWindow()->GetBoundsInScreen().right(),
w1->GetBoundsInScreen().right());
- EXPECT_EQ(internal::kShellWindowId_DockedContainer, w1->parent()->id());
+ EXPECT_EQ(kShellWindowId_DockedContainer, w1->parent()->id());
DockedWindowLayoutManager* manager =
static_cast<DockedWindowLayoutManager*>(w1->parent()->layout_manager());
EXPECT_EQ(DOCKED_ALIGNMENT_RIGHT, docked_alignment(manager));
// Release the mouse and the window should be attached to the edge.
DragEnd();
// The window should stay docked.
- EXPECT_EQ(internal::kShellWindowId_DockedContainer, w1->parent()->id());
+ EXPECT_EQ(kShellWindowId_DockedContainer, w1->parent()->id());
EXPECT_EQ(DOCKED_ALIGNMENT_RIGHT, docked_alignment(manager));
// w1 is now wider and the dock should expand to be as wide as w1.
EXPECT_EQ(previous_width + kResizeSpan1, w1->bounds().width());
// Release the mouse and the window should be attached to the edge.
DragEnd();
// The window should stay docked.
- EXPECT_EQ(internal::kShellWindowId_DockedContainer, w1->parent()->id());
+ EXPECT_EQ(kShellWindowId_DockedContainer, w1->parent()->id());
EXPECT_EQ(DOCKED_ALIGNMENT_RIGHT, docked_alignment(manager));
// The dock should stay as wide as w1 is now (a bit less than before).
EXPECT_EQ(previous_width - kResizeSpan2, w1->bounds().width());
DragToVerticalPositionAndToEdge(DOCKED_EDGE_RIGHT, w1.get(), 20);
DragToVerticalPositionAndToEdge(DOCKED_EDGE_RIGHT, w2.get(), 100);
// Both windows should now be docked at the right edge.
- EXPECT_EQ(internal::kShellWindowId_DockedContainer, w1->parent()->id());
- EXPECT_EQ(internal::kShellWindowId_DockedContainer, w2->parent()->id());
+ EXPECT_EQ(kShellWindowId_DockedContainer, w1->parent()->id());
+ EXPECT_EQ(kShellWindowId_DockedContainer, w2->parent()->id());
// Dock width should be set to ideal width.
DockedWindowLayoutManager* manager =
static_cast<DockedWindowLayoutManager*>(w1->parent()->layout_manager());
// Undock w2 and then dock it back.
DragToVerticalPositionRelativeToEdge(DOCKED_EDGE_RIGHT, w2.get(), -400, 100);
- EXPECT_EQ(internal::kShellWindowId_DefaultContainer, w2->parent()->id());
+ EXPECT_EQ(kShellWindowId_DefaultContainer, w2->parent()->id());
DragToVerticalPositionAndToEdge(DOCKED_EDGE_RIGHT, w2.get(), 100);
- EXPECT_EQ(internal::kShellWindowId_DockedContainer, w2->parent()->id());
+ EXPECT_EQ(kShellWindowId_DockedContainer, w2->parent()->id());
// w2 should become same width as w1.
EXPECT_EQ(w1->bounds().width(), w2->bounds().width());
EXPECT_EQ(w1->bounds().width(), docked_width(manager));
// A window should be docked at the right edge.
EXPECT_EQ(w1->GetRootWindow()->GetBoundsInScreen().right(),
w1->GetBoundsInScreen().right());
- EXPECT_EQ(internal::kShellWindowId_DockedContainer, w1->parent()->id());
+ EXPECT_EQ(kShellWindowId_DockedContainer, w1->parent()->id());
DockedWindowLayoutManager* manager =
static_cast<DockedWindowLayoutManager*>(w1->parent()->layout_manager());
EXPECT_EQ(DOCKED_ALIGNMENT_RIGHT, docked_alignment(manager));
DragToVerticalPositionAndToEdge(DOCKED_EDGE_RIGHT, window.get(), 20);
// A window should be docked at the right edge.
- EXPECT_EQ(internal::kShellWindowId_DockedContainer, window->parent()->id());
- EXPECT_EQ(internal::kShellWindowId_DockedContainer, child->parent()->id());
+ EXPECT_EQ(kShellWindowId_DockedContainer, window->parent()->id());
+ EXPECT_EQ(kShellWindowId_DockedContainer, child->parent()->id());
// Drag the child - it should move freely and stay where it is dragged.
ASSERT_NO_FATAL_FAILURE(DragStart(child.get()));
DragEnd();
// The window should be undocked and the transient child should be reparented.
- EXPECT_EQ(internal::kShellWindowId_DefaultContainer, window->parent()->id());
- EXPECT_EQ(internal::kShellWindowId_DefaultContainer, child->parent()->id());
+ EXPECT_EQ(kShellWindowId_DefaultContainer, window->parent()->id());
+ EXPECT_EQ(kShellWindowId_DefaultContainer, child->parent()->id());
// The child should not have moved.
EXPECT_EQ(gfx::Point(20 + 500, 20 + 20).ToString(),
child->GetBoundsInScreen().origin().ToString());
scoped_ptr<aura::Window> child(CreateModalWindow(gfx::Rect(20, 20, 150, 20)));
::wm::AddTransientChild(window.get(), child.get());
EXPECT_EQ(window.get(), ::wm::GetTransientParent(child.get()));
- EXPECT_EQ(internal::kShellWindowId_SystemModalContainer,
- child->parent()->id());
+ EXPECT_EQ(kShellWindowId_SystemModalContainer, child->parent()->id());
// End the drag, the |window| should have moved (if it is a panel it will
// no longer be attached to the shelf since we dragged it above).
// The original |window| should be in the default container (not docked or
// attached).
- EXPECT_EQ(internal::kShellWindowId_DefaultContainer, window->parent()->id());
+ EXPECT_EQ(kShellWindowId_DefaultContainer, window->parent()->id());
// The transient |child| should still be in system modal container.
- EXPECT_EQ(internal::kShellWindowId_SystemModalContainer,
- child->parent()->id());
+ EXPECT_EQ(kShellWindowId_SystemModalContainer, child->parent()->id());
// The |child| should not have moved.
EXPECT_EQ(gfx::Point(20, 20).ToString(),
child->GetBoundsInScreen().origin().ToString());
// A window should be docked at the right edge.
EXPECT_EQ(w1->GetRootWindow()->GetBoundsInScreen().right(),
w1->GetBoundsInScreen().right());
- EXPECT_EQ(internal::kShellWindowId_DockedContainer, w1->parent()->id());
+ EXPECT_EQ(kShellWindowId_DockedContainer, w1->parent()->id());
DockedWindowLayoutManager* manager =
static_cast<DockedWindowLayoutManager*>(w1->parent()->layout_manager());
EXPECT_EQ(DOCKED_ALIGNMENT_RIGHT, docked_alignment(manager));
EXPECT_EQ(0, docked_width(manager));
EXPECT_EQ(work_area.height(), w1->bounds().height());
EXPECT_EQ(work_area.right(), w1->bounds().right());
- EXPECT_EQ(internal::kShellWindowId_DefaultContainer, w1->parent()->id());
+ EXPECT_EQ(kShellWindowId_DefaultContainer, w1->parent()->id());
EXPECT_FALSE(window_state->IsDocked());
EXPECT_TRUE(window_state->IsSnapped());
// A window should be docked at the right edge.
EXPECT_EQ(w1->GetRootWindow()->GetBoundsInScreen().right(),
w1->GetBoundsInScreen().right());
- EXPECT_EQ(internal::kShellWindowId_DockedContainer, w1->parent()->id());
+ EXPECT_EQ(kShellWindowId_DockedContainer, w1->parent()->id());
EXPECT_EQ(DOCKED_ALIGNMENT_RIGHT, docked_alignment(manager));
EXPECT_EQ(w1->bounds().width(), docked_width(manager));
EXPECT_TRUE(window_state->IsDocked());
EXPECT_EQ(0, docked_width(manager));
EXPECT_EQ(work_area.height(), w1->bounds().height());
EXPECT_EQ(work_area.x(), w1->bounds().x());
- EXPECT_EQ(internal::kShellWindowId_DefaultContainer, w1->parent()->id());
+ EXPECT_EQ(kShellWindowId_DefaultContainer, w1->parent()->id());
EXPECT_FALSE(window_state->IsDocked());
EXPECT_TRUE(window_state->IsSnapped());
}
DragToVerticalPositionAndToEdge(DOCKED_EDGE_RIGHT, window.get(), 20);
EXPECT_EQ(window->GetRootWindow()->GetBoundsInScreen().right(),
window->GetBoundsInScreen().right());
- EXPECT_EQ(internal::kShellWindowId_DockedContainer, window->parent()->id());
+ EXPECT_EQ(kShellWindowId_DockedContainer, window->parent()->id());
DockedWindowLayoutManager* manager =
static_cast<DockedWindowLayoutManager*>(
window->parent()->layout_manager());
generator.ReleaseLeftButton();
// |window| should get undocked.
- EXPECT_EQ(internal::kShellWindowId_DefaultContainer, window->parent()->id());
+ EXPECT_EQ(kShellWindowId_DefaultContainer, window->parent()->id());
EXPECT_EQ(0, docked_width(manager));
EXPECT_EQ(
ScreenUtil::GetMaximizedWindowBoundsInParent(window.get()).ToString(),
DockedWindowResizerTest,
testing::Values(ui::wm::WINDOW_TYPE_NORMAL,
ui::wm::WINDOW_TYPE_PANEL));
-} // namespace internal
+
} // namespace ash
projects / platform / framework / web / crosswalk.git / blobdiff