wm: public window_types.

ash/wm/solo_window_tracker_unittest.cc

 // Copyright 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 "ash/wm/solo_window_tracker.h"
 
 #include "ash/ash_constants.h"
 #include "ash/ash_switches.h"
 #include "ash/root_window_controller.h"
 #include "ash/screen_ash.h"
@@ skipping 56 matching lines @@
 class SoloWindowTrackerTest : public test::AshTestBase {
  public:
   SoloWindowTrackerTest() {
   }
   virtual ~SoloWindowTrackerTest() {
   }
 
   // Helpers methods to create test windows in the primary root window.
   aura::Window* CreateWindowInPrimary() {
     aura::Window* window = new aura::Window(NULL);
-    window->SetType(aura::client::WINDOW_TYPE_NORMAL);
+    window->SetType(ui::wm::WINDOW_TYPE_NORMAL);
     window->Init(ui::LAYER_TEXTURED);
     window->SetBounds(gfx::Rect(100, 100));
     ParentWindowInPrimaryRootWindow(window);
     return window;
   }
   aura::Window* CreateAlwaysOnTopWindowInPrimary() {
     aura::Window* window = new aura::Window(NULL);
-    window->SetType(aura::client::WINDOW_TYPE_NORMAL);
+    window->SetType(ui::wm::WINDOW_TYPE_NORMAL);
     window->Init(ui::LAYER_TEXTURED);
     window->SetBounds(gfx::Rect(100, 100));
     window->SetProperty(aura::client::kAlwaysOnTopKey, true);
     ParentWindowInPrimaryRootWindow(window);
     return window;
   }
   aura::Window* CreatePanelWindowInPrimary() {
     aura::Window* window = new aura::Window(NULL);
-    window->SetType(aura::client::WINDOW_TYPE_PANEL);
+    window->SetType(ui::wm::WINDOW_TYPE_PANEL);
     window->Init(ui::LAYER_TEXTURED);
     window->SetBounds(gfx::Rect(100, 100));
     ParentWindowInPrimaryRootWindow(window);
     return window;
   }
 
   // Drag |window| to the dock.
   void DockWindow(aura::Window* window) {
     // Because the tests use windows without delegates,
     // aura::test::EventGenerator cannot be used.
@@ skipping 184 matching lines @@
 // Non-drawing windows should not affect the solo computation.
 TEST_F(SoloWindowTrackerTest, NotDrawn) {
   aura::Window* w = CreateWindowInPrimary();
   w->Show();
 
   // We only have one window, so it should use a solo header.
   EXPECT_EQ(w, GetWindowWithSoloHeaderInPrimary());
 
   // Create non-drawing window similar to DragDropTracker.
   aura::Window* not_drawn = new aura::Window(NULL);
-  not_drawn->SetType(aura::client::WINDOW_TYPE_NORMAL);
+  not_drawn->SetType(ui::wm::WINDOW_TYPE_NORMAL);
   not_drawn->Init(ui::LAYER_NOT_DRAWN);
   ParentWindowInPrimaryRootWindow(not_drawn);
   not_drawn->Show();
 
   // Despite two windows, the first window should still be considered "solo"
   // because non-drawing windows aren't included in the computation.
   EXPECT_EQ(w, GetWindowWithSoloHeaderInPrimary());
 }
 
 TEST_F(SoloWindowTrackerTest, MultiDisplay) {
@@ skipping 78 matching lines @@
 
 TEST_F(SoloWindowTrackerTest, ChildWindowVisibility) {
   aura::Window* w = CreateWindowInPrimary();
   w->Show();
 
   // We only have one window, so it should use a solo header.
   EXPECT_EQ(w, GetWindowWithSoloHeaderInPrimary());
 
   // Create a child window. This should not affect the solo-ness of |w1|.
   aura::Window* child = new aura::Window(NULL);
-  child->SetType(aura::client::WINDOW_TYPE_CONTROL);
+  child->SetType(ui::wm::WINDOW_TYPE_CONTROL);
   child->Init(ui::LAYER_TEXTURED);
   child->SetBounds(gfx::Rect(100, 100));
   w->AddChild(child);
   child->Show();
   EXPECT_EQ(w, GetWindowWithSoloHeaderInPrimary());
 
   // Changing the visibility of |child| should not affect the solo-ness of |w1|.
   child->Hide();
   EXPECT_EQ(w, GetWindowWithSoloHeaderInPrimary());
 }
@@ skipping 11 matching lines @@
   w.reset();
   EXPECT_EQ(NULL, GetWindowWithSoloHeaderInPrimary());
 
   // Recreate another window again.
   w.reset(CreateWindowInPrimary());
   w->Show();
   EXPECT_EQ(w.get(), GetWindowWithSoloHeaderInPrimary());
 }
 
 }  // namespace ash