| Index: ui/views/corewm/tooltip_controller_unittest.cc
|
| diff --git a/ui/views/corewm/tooltip_controller_unittest.cc b/ui/views/corewm/tooltip_controller_unittest.cc
|
| index f4b9606a2e1125792b8fed955a0404f4614737cf..e8b77a4d3b2190bd83fca17b7d9d4bf2ca17dcc5 100644
|
| --- a/ui/views/corewm/tooltip_controller_unittest.cc
|
| +++ b/ui/views/corewm/tooltip_controller_unittest.cc
|
| @@ -8,7 +8,6 @@
|
| #include "ui/aura/client/cursor_client.h"
|
| #include "ui/aura/client/screen_position_client.h"
|
| #include "ui/aura/client/tooltip_client.h"
|
| -#include "ui/aura/client/window_types.h"
|
| #include "ui/aura/env.h"
|
| #include "ui/aura/root_window.h"
|
| #include "ui/aura/test/aura_test_base.h"
|
| @@ -26,6 +25,7 @@
|
| #include "ui/views/view.h"
|
| #include "ui/views/widget/tooltip_manager.h"
|
| #include "ui/views/widget/widget.h"
|
| +#include "ui/wm/public/window_types.h"
|
|
|
| #if defined(OS_WIN)
|
| #include "ui/base/win/scoped_ole_initializer.h"
|
| @@ -592,8 +592,7 @@ TEST_F(TooltipControllerTest, TooltipsInMultipleRootWindows) {
|
|
|
| bool tooltip_reparented = false;
|
| for (size_t i = 0; i < root_window2->children().size(); ++i) {
|
| - if (root_window2->children()[i]->type() ==
|
| - aura::client::WINDOW_TYPE_TOOLTIP) {
|
| + if (root_window2->children()[i]->type() == ui::wm::WINDOW_TYPE_TOOLTIP) {
|
| tooltip_reparented = true;
|
| break;
|
| }
|
| @@ -639,7 +638,7 @@ TEST_F(TooltipControllerTest, TooltipAtTopOfZOrderAfterActivation) {
|
|
|
| EXPECT_EQ(
|
| widget_->GetNativeWindow()->GetRootWindow()->children().back()->type(),
|
| - aura::client::WINDOW_TYPE_TOOLTIP);
|
| + ui::wm::WINDOW_TYPE_TOOLTIP);
|
| }
|
|
|
| #endif
|
|
|