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

Side by Side Diff: views/layout/box_layout_unittest.cc

Issue 6380010: views: Move box_layout.[cc,h] into the new layout directory. (Closed)
Patch Set: Created 9 years, 11 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
« no previous file with comments | « views/layout/box_layout.cc ('k') | views/views.gyp » ('j') | 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) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 "testing/gtest/include/gtest/gtest.h" 5 #include "testing/gtest/include/gtest/gtest.h"
6 #include "views/box_layout.h" 6 #include "views/layout/box_layout.h"
7 #include "views/view.h" 7 #include "views/view.h"
8 8
9 class StaticSizedView : public views::View { 9 class StaticSizedView : public views::View {
10 public: 10 public:
11 explicit StaticSizedView(const gfx::Size& size) 11 explicit StaticSizedView(const gfx::Size& size)
12 : size_(size) { } 12 : size_(size) { }
13 13
14 virtual gfx::Size GetPreferredSize() { 14 virtual gfx::Size GetPreferredSize() {
15 return size_; 15 return size_;
16 } 16 }
(...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after
102 views::View* v1 = new StaticSizedView(gfx::Size(20, 20)); 102 views::View* v1 = new StaticSizedView(gfx::Size(20, 20));
103 v1->SetVisible(false); 103 v1->SetVisible(false);
104 host_->AddChildView(v1); 104 host_->AddChildView(v1);
105 views::View* v2 = new StaticSizedView(gfx::Size(10, 10)); 105 views::View* v2 = new StaticSizedView(gfx::Size(10, 10));
106 host_->AddChildView(v2); 106 host_->AddChildView(v2);
107 EXPECT_EQ(gfx::Size(30, 30), layout_->GetPreferredSize(host_.get())); 107 EXPECT_EQ(gfx::Size(30, 30), layout_->GetPreferredSize(host_.get()));
108 host_->SetBounds(0, 0, 30, 30); 108 host_->SetBounds(0, 0, 30, 30);
109 layout_->Layout(host_.get()); 109 layout_->Layout(host_.get());
110 EXPECT_EQ(gfx::Rect(10, 10, 10, 10), v2->bounds()); 110 EXPECT_EQ(gfx::Rect(10, 10, 10, 10), v2->bounds());
111 } 111 }
OLDNEW
« no previous file with comments | « views/layout/box_layout.cc ('k') | views/views.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698