Shell related switches -> aura shell switches.

ui/aura/window.cc

 // 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.
 
 #include "ui/aura/window.h"
 
 #include <algorithm>
 
 #include "base/logging.h"
 #include "base/stl_util.h"
 #include "base/string_util.h"
 #include "ui/aura/client/stacking_client.h"
 #include "ui/aura/event.h"
 #include "ui/aura/event_filter.h"
 #include "ui/aura/layout_manager.h"
 #include "ui/aura/root_window.h"
 #include "ui/aura/window_delegate.h"
 #include "ui/aura/window_observer.h"
-#include "ui/aura/window_types.h"
 #include "ui/base/animation/multi_animation.h"
 #include "ui/gfx/canvas_skia.h"
 #include "ui/gfx/compositor/compositor.h"
 #include "ui/gfx/screen.h"
 
 namespace aura {
 
 namespace {
 
 Window* GetParentForWindow(Window* window, Window* suggested_parent) {
   if (suggested_parent)
     return suggested_parent;
   if (client::GetStackingClient())
     return client::GetStackingClient()->GetDefaultParent(window);
   return RootWindow::GetInstance();
 }
 
 }  // namespace
 
 Window::Window(WindowDelegate* delegate)
-    : type_(WINDOW_TYPE_UNKNOWN),
+    : type_(client::WINDOW_TYPE_UNKNOWN),
       delegate_(delegate),
       parent_(NULL),
       transient_parent_(NULL),
       id_(-1),
       user_data_(NULL),
       stops_event_propagation_(false),
       ignore_events_(false) {
 }
 
 Window::~Window() {
@@ skipping 37 matching lines @@
 
 void Window::Init(ui::Layer::LayerType layer_type) {
   layer_.reset(new ui::Layer(layer_type));
   layer_->SetVisible(false);
   layer_->set_delegate(this);
   UpdateLayerName(name_);
 
   RootWindow::GetInstance()->WindowInitialized(this);
 }
 
-void Window::SetType(WindowType type) {
+void Window::SetType(client::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 442 matching lines @@
   if (id_ != -1) {
     char id_buf[10];
     base::snprintf(id_buf, sizeof(id_buf), " %d", id_);
     layer_name.append(id_buf);
   }
   layer()->set_name(layer_name);
 #endif
 }
 
 }  // namespace aura