Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1591)

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

Issue 357063002: Snap widgets to pixel boundary on ash (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: adjust tests Created 6 years, 5 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_layout_manager.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/wm/workspace/workspace_layout_manager_unittest.cc
diff --git a/ash/wm/workspace/workspace_layout_manager_unittest.cc b/ash/wm/workspace/workspace_layout_manager_unittest.cc
index 8dcf3a5f31396e77ca9311d998a796775c66f618..76c7b241d8f38b4407839e1e3a827b38b03b43c1 100644
--- a/ash/wm/workspace/workspace_layout_manager_unittest.cc
+++ b/ash/wm/workspace/workspace_layout_manager_unittest.cc
@@ -523,8 +523,7 @@ TEST_F(WorkspaceLayoutManagerTest, NotifyFullscreenChanges) {
EXPECT_FALSE(observer.is_fullscreen());
}
-// Following tests were originally written for BaseLayoutManager.
-
+// Following "Solo" tests were originally written for BaseLayoutManager.
namespace {
class WorkspaceLayoutManagerSoloTest : public test::AshTestBase {
@@ -532,15 +531,6 @@ class WorkspaceLayoutManagerSoloTest : public test::AshTestBase {
WorkspaceLayoutManagerSoloTest() {}
virtual ~WorkspaceLayoutManagerSoloTest() {}
- virtual void SetUp() OVERRIDE {
- test::AshTestBase::SetUp();
- UpdateDisplay("800x600");
- aura::Window* default_container = Shell::GetContainer(
- Shell::GetPrimaryRootWindow(), kShellWindowId_DefaultContainer);
- default_container->SetLayoutManager(
- new WorkspaceLayoutManager(Shell::GetPrimaryRootWindow()));
- }
-
aura::Window* CreateTestWindow(const gfx::Rect& bounds) {
return CreateTestWindowInShellWithBounds(bounds);
}
@@ -993,8 +983,8 @@ class WorkspaceLayoutManagerKeyboardTest : public test::AshTestBase {
UpdateDisplay("800x600");
aura::Window* default_container = Shell::GetContainer(
Shell::GetPrimaryRootWindow(), kShellWindowId_DefaultContainer);
- layout_manager_ = new WorkspaceLayoutManager(Shell::GetPrimaryRootWindow());
- default_container->SetLayoutManager(layout_manager_);
+ layout_manager_ = static_cast<WorkspaceLayoutManager*>(
+ default_container->layout_manager());
}
aura::Window* CreateTestWindow(const gfx::Rect& bounds) {
« no previous file with comments | « ash/wm/workspace/workspace_layout_manager.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698