aura: Remove layerless windows.

ui/views/widget/desktop_aura/desktop_native_widget_aura_unittest.cc

 // Copyright 2013 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/desktop_aura/desktop_native_widget_aura.h"
 
 #include "base/bind.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/client/cursor_client.h"
 #include "ui/aura/client/window_tree_client.h"
@@ skipping 12 matching lines @@
 
 namespace views {
 namespace test {
 
 typedef ViewsTestBase DesktopNativeWidgetAuraTest;
 
 // Verifies creating a Widget with a parent that is not in a RootWindow doesn't
 // crash.
 TEST_F(DesktopNativeWidgetAuraTest, CreateWithParentNotInRootWindow) {
   scoped_ptr<aura::Window> window(new aura::Window(NULL));
+  window->Init(ui::LAYER_NOT_DRAWN);
   Widget widget;
   Widget::InitParams params = CreateParams(Widget::InitParams::TYPE_WINDOW);
   params.bounds = gfx::Rect(0, 0, 200, 200);
   params.parent = window.get();
   params.ownership = Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;
   params.native_widget = new DesktopNativeWidgetAura(&widget);
   widget.Init(params);
 }
 
 // Verifies that the Aura windows making up a widget instance have the correct
@@ skipping 149 matching lines @@
     Widget::InitParams init_params =
         CreateParams(Widget::InitParams::TYPE_WINDOW);
     init_params.ownership = Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;
     DesktopNativeWidgetAura* desktop_native_widget_aura =
         new DesktopNativeWidgetAura(&widget);
     init_params.native_widget = desktop_native_widget_aura;
     widget.Init(init_params);
 
     // Owned by |widget|.
     aura::Window* window = new aura::Window(&delegate);
+    window->Init(ui::LAYER_NOT_DRAWN);
     window->Show();
     widget.GetNativeWindow()->parent()->AddChild(window);
 
     widget.Show();
   }
 }
 
 void QuitNestedLoopAndCloseWidget(scoped_ptr<Widget> widget,
                                   base::Closure* quit_runloop) {
   quit_runloop->Run();
@@ skipping 56 matching lines @@
                           internal::NativeWidgetDelegate* delegate) override {
     if (!params->native_widget)
       params->native_widget = new views::DesktopNativeWidgetAura(delegate);
   }
 
   void CreateTopLevelWindow(const gfx::Rect& bounds, bool fullscreen) {
     Widget::InitParams init_params;
     init_params.type = Widget::InitParams::TYPE_WINDOW;
     init_params.bounds = bounds;
     init_params.ownership = Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;
-    init_params.layer_type = aura::WINDOW_LAYER_NOT_DRAWN;
+    init_params.layer_type = ui::LAYER_NOT_DRAWN;
     init_params.accept_events = fullscreen;
 
     widget_.Init(init_params);
 
     owned_window_ = new aura::Window(&child_window_delegate_);
     owned_window_->SetType(ui::wm::WINDOW_TYPE_NORMAL);
     owned_window_->SetName("TestTopLevelWindow");
     if (fullscreen) {
       owned_window_->SetProperty(aura::client::kShowStateKey,
                                  ui::SHOW_STATE_FULLSCREEN);
     } else {
       owned_window_->SetType(ui::wm::WINDOW_TYPE_MENU);
     }
-    owned_window_->Init(aura::WINDOW_LAYER_TEXTURED);
+    owned_window_->Init(ui::LAYER_TEXTURED);
     aura::client::ParentWindowWithContext(
         owned_window_,
         widget_.GetNativeView()->GetRootWindow(),
         gfx::Rect(0, 0, 1900, 1600));
     owned_window_->Show();
     owned_window_->AddObserver(this);
 
     ASSERT_TRUE(owned_window_->parent() != NULL);
     owned_window_->parent()->AddObserver(this);
 
@@ skipping 197 matching lines @@
   RunCloseWidgetDuringDispatchTest(this, ui::ET_MOUSE_PRESSED);
 }
 
 // Verifies deleting the widget from a mouse released event doesn't crash.
 TEST_F(DesktopAuraWidgetTest, CloseWidgetDuringMouseReleased) {
   RunCloseWidgetDuringDispatchTest(this, ui::ET_MOUSE_RELEASED);
 }
 
 }  // namespace test
 }  // namespace views