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

Side by Side Diff: ash/wm/workspace/workspace_window_resizer_unittest.cc

Issue 16968003: Rewrite scoped_ptr<T>(NULL) to use the default ctor in ash/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 6 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « ash/wm/workspace/workspace_manager.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "ash/wm/workspace/workspace_window_resizer.h" 5 #include "ash/wm/workspace/workspace_window_resizer.h"
6 6
7 #include "ash/ash_switches.h" 7 #include "ash/ash_switches.h"
8 #include "ash/display/display_controller.h" 8 #include "ash/display/display_controller.h"
9 #include "ash/root_window_controller.h" 9 #include "ash/root_window_controller.h"
10 #include "ash/screen_ash.h" 10 #include "ash/screen_ash.h"
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
60 } 60 }
61 61
62 gfx::Size min_size_; 62 gfx::Size min_size_;
63 gfx::Size max_size_; 63 gfx::Size max_size_;
64 64
65 DISALLOW_COPY_AND_ASSIGN(TestWindowDelegate); 65 DISALLOW_COPY_AND_ASSIGN(TestWindowDelegate);
66 }; 66 };
67 67
68 class WorkspaceWindowResizerTest : public test::AshTestBase { 68 class WorkspaceWindowResizerTest : public test::AshTestBase {
69 public: 69 public:
70 WorkspaceWindowResizerTest() : window_(NULL) {} 70 WorkspaceWindowResizerTest() {}
71 virtual ~WorkspaceWindowResizerTest() {} 71 virtual ~WorkspaceWindowResizerTest() {}
72 72
73 virtual void SetUp() OVERRIDE { 73 virtual void SetUp() OVERRIDE {
74 AshTestBase::SetUp(); 74 AshTestBase::SetUp();
75 UpdateDisplay(base::StringPrintf("800x%d", kRootHeight)); 75 UpdateDisplay(base::StringPrintf("800x%d", kRootHeight));
76 76
77 aura::RootWindow* root = Shell::GetPrimaryRootWindow(); 77 aura::RootWindow* root = Shell::GetPrimaryRootWindow();
78 gfx::Rect root_bounds(root->bounds()); 78 gfx::Rect root_bounds(root->bounds());
79 #if defined(OS_WIN) 79 #if defined(OS_WIN)
80 // RootWindow and Display can't resize on Windows Ash. 80 // RootWindow and Display can't resize on Windows Ash.
(...skipping 1499 matching lines...) Expand 10 before | Expand all | Expand 10 after
1580 ASSERT_TRUE(resizer.get()); 1580 ASSERT_TRUE(resizer.get());
1581 // Move it 50 to the left, which should contract w1 and expand w2-3. 1581 // Move it 50 to the left, which should contract w1 and expand w2-3.
1582 resizer->Drag(CalculateDragPoint(*resizer, -50, 0), 0); 1582 resizer->Drag(CalculateDragPoint(*resizer, -50, 0), 0);
1583 EXPECT_EQ("100,100 98x100", window_->bounds().ToString()); 1583 EXPECT_EQ("100,100 98x100", window_->bounds().ToString());
1584 EXPECT_EQ("198,100 101x100", window2_->bounds().ToString()); 1584 EXPECT_EQ("198,100 101x100", window2_->bounds().ToString());
1585 EXPECT_EQ("299,100 101x100", window3_->bounds().ToString()); 1585 EXPECT_EQ("299,100 101x100", window3_->bounds().ToString());
1586 } 1586 }
1587 1587
1588 } // namespace internal 1588 } // namespace internal
1589 } // namespace ash 1589 } // namespace ash
OLDNEW
« no previous file with comments | « ash/wm/workspace/workspace_manager.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698