wm: public window_types.

ui/views/corewm/tooltip_controller_unittest.cc

 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/views/corewm/tooltip_controller.h"
 
 #include "base/strings/utf_string_conversions.h"
 #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"
 #include "ui/aura/test/event_generator.h"
 #include "ui/aura/test/test_screen.h"
 #include "ui/aura/window.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/font.h"
 #include "ui/gfx/point.h"
 #include "ui/gfx/screen.h"
 #include "ui/gfx/screen_type_delegate.h"
 #include "ui/gfx/text_elider.h"
 #include "ui/views/corewm/tooltip_aura.h"
 #include "ui/views/corewm/tooltip_controller_test_helper.h"
 #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"
 #endif
 
 #if !defined(OS_CHROMEOS)
 #include "ui/views/widget/desktop_aura/desktop_native_widget_aura.h"
 #include "ui/views/widget/desktop_aura/desktop_screen.h"
 #endif
 
@@ skipping 546 matching lines @@
               generator_->current_location()));
     base::string16 expected_tooltip =
         ASCIIToUTF16("Tooltip Text For RootWindow2");
     EXPECT_EQ(expected_tooltip, aura::client::GetTooltipText(window2));
     EXPECT_EQ(expected_tooltip, helper_->GetTooltipText());
     EXPECT_EQ(window2, helper_->GetTooltipWindow());
   }
 
   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;
     }
   }
   EXPECT_TRUE(tooltip_reparented);
   widget2->Close();
 }
 
 // This test validates whether the tooltip after becoming visible stays at the
 // top of the ZOrder in its root window after activation changes.
@@ skipping 25 matching lines @@
   // ZOrder change which should not affect the position of the tooltip.
   DesktopNativeWidgetAura* native_widget =
       static_cast<DesktopNativeWidgetAura*>(widget_->native_widget());
   EXPECT_TRUE(native_widget != NULL);
 
   native_widget->HandleActivationChanged(false);
   native_widget->HandleActivationChanged(true);
 
   EXPECT_EQ(
       widget_->GetNativeWindow()->GetRootWindow()->children().back()->type(),
-      aura::client::WINDOW_TYPE_TOOLTIP);
+      ui::wm::WINDOW_TYPE_TOOLTIP);
 }
 
 #endif
 
 }  // namespace test
 }  // namespace corewm
 }  // namespace views