wm: public window_types.

ui/aura/test/test_windows.cc

 // Copyright (c) 2012 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/aura/test/test_windows.h"
 
 #include "base/strings/string_number_conversions.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/window.h"
 #include "ui/compositor/layer.h"
@@ skipping 16 matching lines @@
                          Window* parent) {
   return CreateTestWindowWithDelegate(new ColorTestWindowDelegate(color),
                                       id, bounds, parent);
 }
 
 Window* CreateTestWindowWithDelegate(WindowDelegate* delegate,
                                      int id,
                                      const gfx::Rect& bounds,
                                      Window* parent) {
   return CreateTestWindowWithDelegateAndType(
-      delegate,
-      aura::client::WINDOW_TYPE_NORMAL,
-      id,
-      bounds,
-      parent);
+      delegate, ui::wm::WINDOW_TYPE_NORMAL, id, bounds, parent);
 }
 
 Window* CreateTestWindowWithDelegateAndType(WindowDelegate* delegate,
-                                            client::WindowType type,
+                                            ui::wm::WindowType type,
                                             int id,
                                             const gfx::Rect& bounds,
                                             Window* parent) {
   Window* window = new Window(delegate);
   window->set_id(id);
   window->SetType(type);
   window->Init(ui::LAYER_TEXTURED);
   window->SetBounds(bounds);
   window->Show();
   if (parent)
@@ skipping 28 matching lines @@
        i != parent->children().end(); ++i) {
     if (!result.empty())
       result += " ";
     result += base::IntToString((*i)->id());
   }
   return result;
 }
 
 }  // namespace test
 }  // namespace aura