| Index: ui/views/widget/widget_unittest.cc
|
| diff --git a/ui/views/widget/widget_unittest.cc b/ui/views/widget/widget_unittest.cc
|
| index cb29c4e65d25d9d2deea0b576ac7b9fca46852fb..cba52bfd27c2fe80bcd2bfdeb1a9de67c088691d 100644
|
| --- a/ui/views/widget/widget_unittest.cc
|
| +++ b/ui/views/widget/widget_unittest.cc
|
| @@ -1134,13 +1134,13 @@ class DesktopAuraTopLevelWindowTest
|
| widget_.Init(init_params);
|
|
|
| owned_window_ = new aura::Window(&child_window_delegate_);
|
| - owned_window_->SetType(aura::client::WINDOW_TYPE_NORMAL);
|
| + owned_window_->SetType(ui::wm::WINDOW_TYPE_NORMAL);
|
| owned_window_->SetName("TestTopLevelWindow");
|
| if (fullscreen) {
|
| owned_window_->SetProperty(aura::client::kShowStateKey,
|
| ui::SHOW_STATE_FULLSCREEN);
|
| } else {
|
| - owned_window_->SetType(aura::client::WINDOW_TYPE_MENU);
|
| + owned_window_->SetType(ui::wm::WINDOW_TYPE_MENU);
|
| }
|
| owned_window_->Init(ui::LAYER_TEXTURED);
|
| aura::client::ParentWindowWithContext(
|
|
|