ash/wm/workspace/workspace_window_resizer_unittest.cc - Issue 9616045: Aura/Ash split: Move ScreenAura to ash::ScreenAsh.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: ash/wm/workspace/workspace_window_resizer_unittest.cc

Issue 9616045: Aura/Ash split: Move ScreenAura to ash::ScreenAsh. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Use a separate aura::TestScreen in tests instead, partially reverting to patchset 2 Created 8 years, 9 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/wm/workspace/workspace_manager_unittest.cc ('k') | chrome/browser/ui/views/accessibility_event_router_views_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 d129d1e3b772b0c10e2370a8eb21a2b959d7c4ef..88c89871535a23933a7161609089b3bc96aa5c55 100644

--- a/ash/wm/workspace/workspace_window_resizer_unittest.cc

+++ b/ash/wm/workspace/workspace_window_resizer_unittest.cc

@@ -4,11 +4,11 @@

#include "ash/wm/workspace/workspace_window_resizer.h"

+#include "ash/screen_ash.h"

#include "ash/shell.h"

#include "ash/test/ash_test_base.h"

#include "base/string_number_conversions.h"

#include "ui/aura/root_window.h"

-#include "ui/aura/screen_aura.h"

#include "ui/aura/test/test_window_delegate.h"

#include "ui/base/hit_test.h"

@@ -51,7 +51,7 @@ class WorkspaceWindowResizerTest : public test::AshTestBase {

root->SetBounds(gfx::Rect(0, 0, 800, kRootHeight));

gfx::Rect root_bounds(root->bounds());

EXPECT_EQ(kRootHeight, root_bounds.height());

- root->SetScreenWorkAreaInsets(gfx::Insets());

+ Shell::GetInstance()->SetScreenWorkAreaInsets(gfx::Insets());

window_.reset(new aura::Window(&delegate_));

window_->Init(ui::Layer::LAYER_NOT_DRAWN);

window_->SetParent(Shell::GetInstance()->GetRootWindow());

@@ -546,7 +546,7 @@ TEST_F(WorkspaceWindowResizerTest, AttachedResize_BOTTOM_2_REMEMBER) {

TEST_F(WorkspaceWindowResizerTest, AttachedResize_BOTTOM_3) {

aura::RootWindow* root = Shell::GetInstance()->GetRootWindow();

root->SetBounds(gfx::Rect(0, 0, 600, 800));

- root->SetScreenWorkAreaInsets(gfx::Insets());

+ Shell::GetInstance()->SetScreenWorkAreaInsets(gfx::Insets());

window_->SetBounds(gfx::Rect( 300, 100, 300, 200));

window2_->SetBounds(gfx::Rect(300, 300, 200, 150));

@@ -588,7 +588,7 @@ TEST_F(WorkspaceWindowResizerTest, AttachedResize_BOTTOM_3) {

TEST_F(WorkspaceWindowResizerTest, AttachedResize_BOTTOM_RememberHeight) {

aura::RootWindow* root = Shell::GetInstance()->GetRootWindow();

root->SetBounds(gfx::Rect(0, 0, 600, 800));

- root->SetScreenWorkAreaInsets(gfx::Insets());

+ Shell::GetInstance()->SetScreenWorkAreaInsets(gfx::Insets());

window_->SetBounds(gfx::Rect( 300, 100, 300, 200));

window2_->SetBounds(gfx::Rect(300, 300, 200, 150));