| Index: ui/aura_shell/default_container_layout_manager_unittest.cc
|
| diff --git a/ui/aura_shell/default_container_layout_manager_unittest.cc b/ui/aura_shell/default_container_layout_manager_unittest.cc
|
| index d53be63f4119459c1b9b04471b6a37fa625b8475..c7fe7043a6b8d56fb589bdff9b6d2e46c8885308 100644
|
| --- a/ui/aura_shell/default_container_layout_manager_unittest.cc
|
| +++ b/ui/aura_shell/default_container_layout_manager_unittest.cc
|
| @@ -44,13 +44,11 @@ class DefaultContainerLayoutManagerTest : public aura::test::AuraTestBase {
|
|
|
| aura::Window* CreateTestWindowWithType(const gfx::Rect& bounds,
|
| aura::Window* parent,
|
| - Widget::InitParams::Type type) {
|
| + aura::WindowType type) {
|
| aura::Window* window = new aura::Window(NULL);
|
| - props_.push_back(new ui::ViewProp(
|
| - window, views::NativeWidgetAura::kWindowTypeKey,
|
| - reinterpret_cast<void*>(type)));
|
| window->SetType(type);
|
| - window->Init(ui::Layer::LAYER_HAS_NO_TEXTURE);
|
| + window->Init(ui::Layer::LAYER_HAS_NO_TEXTURE,
|
| + aura::Window::LAYER_INITIALLY_INVISIBLE);
|
| window->SetBounds(bounds);
|
| window->Show();
|
| window->SetParent(parent);
|
| @@ -61,7 +59,7 @@ class DefaultContainerLayoutManagerTest : public aura::test::AuraTestBase {
|
| aura::Window* parent) {
|
| return CreateTestWindowWithType(bounds,
|
| parent,
|
| - Widget::InitParams::TYPE_WINDOW);
|
| + aura::WINDOW_TYPE_NORMAL);
|
| }
|
|
|
| aura::Window* container() { return container_.get(); }
|
| @@ -73,7 +71,6 @@ class DefaultContainerLayoutManagerTest : public aura::test::AuraTestBase {
|
|
|
| private:
|
| scoped_ptr<aura::Window> container_;
|
| - ScopedVector<ui::ViewProp> props_;
|
| scoped_ptr<aura_shell::WorkspaceManager> workspace_manager_;
|
| DefaultContainerLayoutManager* default_container_layout_manager_;
|
|
|
| @@ -128,7 +125,7 @@ TEST_F(DefaultContainerLayoutManagerTest, Popup) {
|
| scoped_ptr<aura::Window> popup(
|
| CreateTestWindowWithType(gfx::Rect(0, -1000, 100, 100),
|
| container(),
|
| - Widget::InitParams::TYPE_POPUP));
|
| + aura::WINDOW_TYPE_POPUP));
|
| // A popup window can be placed outside of draggable area.
|
| EXPECT_EQ("0,-1000 100x100", popup->bounds().ToString());
|
|
|
|
|