Makes Window::Init take a WindowLayerType instead of LayerType.

ui/aura/window.h

 // 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.
 
 #ifndef UI_AURA_WINDOW_H_
 #define UI_AURA_WINDOW_H_
 
 #include <map>
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/observer_list.h"
 #include "base/strings/string16.h"
 #include "ui/aura/aura_export.h"
 #include "ui/aura/window_layer_type.h"
 #include "ui/aura/window_observer.h"
 #include "ui/compositor/layer_animator.h"
 #include "ui/compositor/layer_delegate.h"
 #include "ui/compositor/layer_owner.h"
-#include "ui/compositor/layer_type.h"
 #include "ui/events/event_constants.h"
 #include "ui/events/event_target.h"
 #include "ui/events/event_targeter.h"
 #include "ui/events/gestures/gesture_types.h"
 #include "ui/gfx/insets.h"
 #include "ui/gfx/native_widget_types.h"
 #include "ui/gfx/rect.h"
 #include "ui/wm/public/window_types.h"
 
 namespace gfx {
@@ skipping 45 matching lines @@
     STACK_ABOVE,
     STACK_BELOW
   };
 
   typedef std::vector<Window*> Windows;
 
   explicit Window(WindowDelegate* delegate);
   virtual ~Window();
 
   // Initializes the window. This creates the window's layer.
-  void Init(ui::LayerType layer_type);
-
-  // TODO(sky): replace other Init() with this once m32 is more baked.
-  void InitWithWindowLayerType(WindowLayerType layer_type);
+  void Init(WindowLayerType layer_type);
 
   // Creates a new layer for the window. Erases the layer-owned bounds, so the
   // caller may wish to set new bounds and other state on the window/layer.
   // Returns the old layer, which can be used for animations. Caller owns the
   // memory for the returned layer and must delete it when animation completes.
   // Returns NULL and does not recreate layer if window does not own its layer.
   ui::Layer* RecreateLayer() WARN_UNUSED_RESULT;
 
   void set_owned_by_parent(bool owned_by_parent) {
     owned_by_parent_ = owned_by_parent;
@@ skipping 476 matching lines @@
   };
 
   std::map<const void*, Value> prop_map_;
 
   DISALLOW_COPY_AND_ASSIGN(Window);
 };
 
 }  // namespace aura
 
 #endif  // UI_AURA_WINDOW_H_