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

ui/views/widget/widget.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/views/widget/widget.h"
 
 #include "base/debug/trace_event.h"
 #include "base/logging.h"
 #include "base/message_loop/message_loop.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 109 matching lines @@
       mirror_origin_in_rtl(false),
       has_dropshadow(false),
       remove_standard_frame(false),
       use_system_default_icon(false),
       show_state(ui::SHOW_STATE_DEFAULT),
       double_buffer(false),
       parent(NULL),
       native_widget(NULL),
       desktop_root_window_host(NULL),
       top_level(false),
-      layer_type(ui::LAYER_TEXTURED),
+      layer_type(aura::WINDOW_LAYER_TEXTURED),
       context(NULL) {
 }
 
 Widget::InitParams::InitParams(Type type)
     : type(type),
       delegate(NULL),
       child(type == TYPE_CONTROL),
       opacity(INFER_OPACITY),
       accept_events(true),
       can_activate(type != TYPE_POPUP && type != TYPE_MENU &&
                    type != TYPE_DRAG),
       keep_on_top(type == TYPE_MENU || type == TYPE_DRAG),
       ownership(NATIVE_WIDGET_OWNS_WIDGET),
       mirror_origin_in_rtl(false),
       has_dropshadow(false),
       remove_standard_frame(false),
       use_system_default_icon(false),
       show_state(ui::SHOW_STATE_DEFAULT),
       double_buffer(false),
       parent(NULL),
       native_widget(NULL),
       desktop_root_window_host(NULL),
       top_level(false),
-      layer_type(ui::LAYER_TEXTURED),
+      layer_type(aura::WINDOW_LAYER_TEXTURED),
       context(NULL) {
 }
 
 Widget::InitParams::~InitParams() {
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // Widget, public:
 
 Widget::Widget()
@@ skipping 1256 matching lines @@
 
 ////////////////////////////////////////////////////////////////////////////////
 // internal::NativeWidgetPrivate, NativeWidget implementation:
 
 internal::NativeWidgetPrivate* NativeWidgetPrivate::AsNativeWidgetPrivate() {
   return this;
 }
 
 }  // namespace internal
 }  // namespace views