Shell related switches -> aura shell switches.

ui/aura/window.h

 // Copyright (c) 2011 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.
 
 #ifndef UI_AURA_WINDOW_H_
 #define UI_AURA_WINDOW_H_
 #pragma once
 
 #include <map>
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/observer_list.h"
 #include "base/string16.h"
 #include "ui/base/events.h"
 #include "ui/aura/aura_export.h"
-#include "ui/aura/window_types.h"
+#include "ui/aura/client/window_types.h"
 #include "ui/gfx/compositor/layer.h"
 #include "ui/gfx/compositor/layer_animator.h"
 #include "ui/gfx/compositor/layer_delegate.h"
 #include "ui/gfx/native_widget_types.h"
 #include "ui/gfx/rect.h"
 
 class SkCanvas;
 
 namespace ui {
 class Layer;
@@ skipping 20 matching lines @@
   typedef std::vector<Window*> Windows;
 
   explicit Window(WindowDelegate* delegate);
   virtual ~Window();
 
   void Init(ui::Layer::LayerType layer_type);
 
   // A type is used to identify a class of Windows and customize behavior such
   // as event handling and parenting.  This field should only be consumed by the
   // shell -- Aura itself shouldn't contain type-specific logic.
-  WindowType type() const { return type_; }
-  void SetType(WindowType type);
+  client::WindowType type() const { return type_; }
+  void SetType(client::WindowType type);
 
   int id() const { return id_; }
   void set_id(int id) { id_ = id; }
 
   const std::string& name() const { return name_; }
   void SetName(const std::string& name);
 
   const string16 title() const { return title_; }
   void set_title(const string16& title) { title_ = title; }
 
@@ skipping 219 matching lines @@
 
   // Called when this window's stacking order among its siblings is changed.
   void OnStackingChanged();
 
   // Overridden from ui::LayerDelegate:
   virtual void OnPaintLayer(gfx::Canvas* canvas) OVERRIDE;
 
   // Updates the layer name with a name based on the window's name and id.
   void UpdateLayerName(const std::string& name);
 
-  WindowType type_;
+  client::WindowType type_;
 
   WindowDelegate* delegate_;
 
   scoped_ptr<ui::Layer> layer_;
 
   // The Window's parent.
   Window* parent_;
 
   // Child windows. Topmost is last.
   Windows children_;
@@ skipping 28 matching lines @@
   // TODO(oshima): Consolidcate ViewProp and aura::window property
   // implementation.
   std::map<const char*, void*> prop_map_;
 
   DISALLOW_COPY_AND_ASSIGN(Window);
 };
 
 }  // namespace aura
 
 #endif  // UI_AURA_WINDOW_H_