wm: public window_types.

ui/aura/window.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/window.h"
 
 #include <algorithm>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 196 matching lines @@
 
  private:
   Window* window_;
   bool hid_cursor_;
 
   DISALLOW_COPY_AND_ASSIGN(ScopedCursorHider);
 };
 
 Window::Window(WindowDelegate* delegate)
     : dispatcher_(NULL),
-      type_(client::WINDOW_TYPE_UNKNOWN),
+      type_(ui::wm::WINDOW_TYPE_UNKNOWN),
       owned_by_parent_(true),
       delegate_(delegate),
       parent_(NULL),
       transient_parent_(NULL),
       visible_(false),
       id_(-1),
       transparent_(false),
       user_data_(NULL),
       ignore_events_(false),
       // Don't notify newly added observers during notification. This causes
@@ skipping 113 matching lines @@
   std::vector<ui::Layer*> children_copy = old_layer->children();
   for (std::vector<ui::Layer*>::const_iterator it = children_copy.begin();
        it != children_copy.end();
        ++it) {
     ui::Layer* child = *it;
     layer_->Add(child);
   }
   return old_layer;
 }
 
-void Window::SetType(client::WindowType type) {
+void Window::SetType(ui::wm::WindowType type) {
   // Cannot change type after the window is initialized.
   DCHECK(!layer_);
   type_ = type;
 }
 
 void Window::SetName(const std::string& name) {
   name_ = name;
 
   if (layer_)
     UpdateLayerName(name_);
@@ skipping 1196 matching lines @@
       return window;
     if (offset)
       *offset += window->bounds().OffsetFromOrigin();
   }
   if (offset)
     *offset = gfx::Vector2d();
   return NULL;
 }
 
 }  // namespace aura