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

mojo/examples/aura_demo/aura_demo.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 <stdio.h>
 #include <string>
 
 #include "base/message_loop/message_loop.h"
 #include "mojo/common/bindings_support_impl.h"
 #include "mojo/examples/aura_demo/demo_screen.h"
@@ skipping 130 matching lines @@
     aura::RootWindow::CreateParams params(gfx::Rect(0, 0, 500, 500));
     params.host = root_window_host_.get();
     root_window_.reset(new aura::RootWindow(params));
     root_window_host_->set_delegate(root_window_.get());
     root_window_->Init();
 
     window_tree_client_.reset(new DemoWindowTreeClient(root_window_->window()));
 
     delegate1_.reset(new DemoWindowDelegate(SK_ColorBLUE));
     window1_ = new aura::Window(delegate1_.get());
-    window1_->Init(ui::LAYER_TEXTURED);
+    window1_->Init(aura::WINDOW_LAYER_TEXTURED);
     window1_->SetBounds(gfx::Rect(100, 100, 400, 400));
     window1_->Show();
     root_window_->window()->AddChild(window1_);
 
     delegate2_.reset(new DemoWindowDelegate(SK_ColorRED));
     window2_ = new aura::Window(delegate2_.get());
-    window2_->Init(ui::LAYER_TEXTURED);
+    window2_->Init(aura::WINDOW_LAYER_TEXTURED);
     window2_->SetBounds(gfx::Rect(200, 200, 350, 350));
     window2_->Show();
     root_window_->window()->AddChild(window2_);
 
     delegate21_.reset(new DemoWindowDelegate(SK_ColorGREEN));
     window21_ = new aura::Window(delegate21_.get());
-    window21_->Init(ui::LAYER_TEXTURED);
+    window21_->Init(aura::WINDOW_LAYER_TEXTURED);
     window21_->SetBounds(gfx::Rect(10, 10, 50, 50));
     window21_->Show();
     window2_->AddChild(window21_);
 
     root_window_->host()->Show();
   }
 
   scoped_ptr<DemoScreen> screen_;
 
   scoped_ptr<DemoWindowTreeClient> window_tree_client_;
@@ skipping 26 matching lines @@
   //             Aura that doesn't define platform-specific stuff.
   aura::Env::CreateInstance();
   mojo::examples::AuraDemo app(
       mojo::MakeScopedHandle(mojo::MessagePipeHandle(shell_handle)).Pass());
   loop.Run();
 
   MojoGLES2Terminate();
   mojo::BindingsSupport::Set(NULL);
   return MOJO_RESULT_OK;
 }