| Index: ash/wm/workspace/workspace_window_resizer_unittest.cc
|
| diff --git a/ash/wm/workspace/workspace_window_resizer_unittest.cc b/ash/wm/workspace/workspace_window_resizer_unittest.cc
|
| index d3654c0c6140aa87b5676013afc11a8b434abb11..eed78aee89715f85c4a9dedd0173a287b588f92e 100644
|
| --- a/ash/wm/workspace/workspace_window_resizer_unittest.cc
|
| +++ b/ash/wm/workspace/workspace_window_resizer_unittest.cc
|
| @@ -55,7 +55,7 @@ class WorkspaceWindowResizerTest : public test::AshTestBase {
|
|
|
| gfx::Rect root_bounds(root->bounds());
|
| EXPECT_EQ(kRootHeight, root_bounds.height());
|
| - Shell::GetInstance()->SetMonitorWorkAreaInsets(root, gfx::Insets());
|
| + Shell::GetInstance()->SetDisplayWorkAreaInsets(root, gfx::Insets());
|
| window_.reset(new aura::Window(&delegate_));
|
| window_->Init(ui::LAYER_NOT_DRAWN);
|
| window_->SetParent(root);
|
| @@ -347,13 +347,13 @@ TEST_F(WorkspaceWindowResizerTest, AttachedResize_BOTTOM_2) {
|
| // Assertions around attached window resize dragging from the bottom with 3
|
| // windows.
|
| // TODO(oshima): Host window doesn't get a resize event after
|
| -// SetHostSize on Windows trybot, which gives wrong work/monitor area.
|
| +// SetHostSize on Windows trybot, which gives wrong work/display area.
|
| TEST_F(WorkspaceWindowResizerTest, AttachedResize_BOTTOM_3) {
|
| aura::RootWindow* root = Shell::GetPrimaryRootWindow();
|
| root->SetHostSize(gfx::Size(600, 800));
|
| LOG(ERROR) << "=== Calling OnHostResized, 600x800";
|
|
|
| - Shell::GetInstance()->SetMonitorWorkAreaInsets(root, gfx::Insets());
|
| + Shell::GetInstance()->SetDisplayWorkAreaInsets(root, gfx::Insets());
|
|
|
| window_->SetBounds(gfx::Rect( 300, 100, 300, 200));
|
| window2_->SetBounds(gfx::Rect(300, 300, 200, 150));
|
| @@ -496,7 +496,7 @@ TEST_F(WorkspaceWindowResizerTest, RestackAttached) {
|
|
|
| // Makes sure we don't allow dragging below the work area.
|
| TEST_F(WorkspaceWindowResizerTest, DontDragOffBottom) {
|
| - Shell::GetInstance()->SetMonitorWorkAreaInsets(
|
| + Shell::GetInstance()->SetDisplayWorkAreaInsets(
|
| Shell::GetPrimaryRootWindow(), gfx::Insets(0, 0, 10, 0));
|
|
|
| window_->SetBounds(gfx::Rect(100, 200, 300, 400));
|
| @@ -513,7 +513,7 @@ TEST_F(WorkspaceWindowResizerTest, DontDragOffBottom) {
|
|
|
| // Makes sure we don't allow dragging off the top of the work area.
|
| TEST_F(WorkspaceWindowResizerTest, DontDragOffTop) {
|
| - Shell::GetInstance()->SetMonitorWorkAreaInsets(
|
| + Shell::GetInstance()->SetDisplayWorkAreaInsets(
|
| Shell::GetPrimaryRootWindow(), gfx::Insets(10, 0, 0, 0));
|
|
|
| window_->SetBounds(gfx::Rect(100, 200, 300, 400));
|
| @@ -526,7 +526,7 @@ TEST_F(WorkspaceWindowResizerTest, DontDragOffTop) {
|
| }
|
|
|
| TEST_F(WorkspaceWindowResizerTest, ResizeBottomOutsideWorkArea) {
|
| - Shell::GetInstance()->SetMonitorWorkAreaInsets(
|
| + Shell::GetInstance()->SetDisplayWorkAreaInsets(
|
| Shell::GetPrimaryRootWindow(), gfx::Insets(0, 0, 50, 0));
|
|
|
| window_->SetBounds(gfx::Rect(100, 200, 300, 380));
|
| @@ -595,7 +595,7 @@ TEST_F(WorkspaceWindowResizerTest, SnapToEdge) {
|
| // the work area.
|
| TEST_F(WorkspaceWindowResizerTest, TallWindow) {
|
| aura::RootWindow* root = Shell::GetPrimaryRootWindow();
|
| - Shell::GetInstance()->SetMonitorWorkAreaInsets(
|
| + Shell::GetInstance()->SetDisplayWorkAreaInsets(
|
| root, gfx::Insets(0, 0, 50, 0));
|
| window_->SetBounds(gfx::Rect(0, 0, 320, 560));
|
| SetGridSize(16);
|
|
|