| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 "services/window_manager/window_manager_test_util.h" | 5 #include "services/window_manager/window_manager_test_util.h" |
| 6 | 6 |
| 7 #include "base/stl_util.h" | 7 #include "base/stl_util.h" |
| 8 #include "mojo/converters/geometry/geometry_type_converters.h" | 8 #include "mojo/converters/geometry/geometry_type_converters.h" |
| 9 #include "ui/gfx/geometry/rect.h" | 9 #include "ui/gfx/geometry/rect.h" |
| 10 | 10 |
| 11 namespace mojo { | 11 namespace window_manager { |
| 12 | 12 |
| 13 TestView::TestView(int id, const gfx::Rect& rect) | 13 TestView::TestView(int id, const gfx::Rect& rect) |
| 14 : target_(new ViewTarget(this)) { | 14 : target_(new ViewTarget(this)) { |
| 15 ViewPrivate(this).set_id(id); | 15 mojo::ViewPrivate(this).set_id(id); |
| 16 | 16 |
| 17 mojo::Rect mojo_rect = *mojo::Rect::From(rect); | 17 mojo::Rect mojo_rect = *mojo::Rect::From(rect); |
| 18 SetBounds(mojo_rect); | 18 SetBounds(mojo_rect); |
| 19 } | 19 } |
| 20 | 20 |
| 21 TestView::TestView(int id, const gfx::Rect& rect, View* parent) | 21 TestView::TestView(int id, const gfx::Rect& rect, View* parent) |
| 22 : TestView(id, rect) { | 22 : TestView(id, rect) { |
| 23 parent->AddChild(this); | 23 parent->AddChild(this); |
| 24 } | 24 } |
| 25 | 25 |
| 26 TestView::~TestView() { | 26 TestView::~TestView() { |
| 27 } | 27 } |
| 28 | 28 |
| 29 // static | 29 // static |
| 30 TestView* TestView::Build(int id, const gfx::Rect& rect) { | 30 TestView* TestView::Build(int id, const gfx::Rect& rect) { |
| 31 return new TestView(id, rect); | 31 return new TestView(id, rect); |
| 32 } | 32 } |
| 33 | 33 |
| 34 // static | 34 // static |
| 35 TestView* TestView::Build(int id, const gfx::Rect& rect, View* parent) { | 35 TestView* TestView::Build(int id, const gfx::Rect& rect, mojo::View* parent) { |
| 36 return new TestView(id, rect, parent); | 36 return new TestView(id, rect, parent); |
| 37 } | 37 } |
| 38 | 38 |
| 39 } // namespace mojo | 39 } // namespace window_manager |
| OLD | NEW |