Rework View Layer Draw() to use the Layer::DrawTree() method and the LayerDelegate.

aura/desktop.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 "aura/desktop.h"
 
 #include "aura/desktop_host.h"
 #include "aura/root_window.h"
 #include "aura/window.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "ui/gfx/compositor/compositor.h"
+#include "ui/gfx/compositor/layer.h"
 
 namespace aura {
 
 // static
 Desktop* Desktop::instance_ = NULL;
 
 Desktop::Desktop()
     : host_(aura::DesktopHost::Create(gfx::Rect(200, 200, 1024, 768))),
       ALLOW_THIS_IN_INITIALIZER_LIST(schedule_paint_(this)) {
   DCHECK(MessageLoopForUI::current())
@@ skipping 18 matching lines @@
   host_->SetSize(size);
 }
 
 void Desktop::Run() {
   Show();
   MessageLoopForUI::current()->Run(host_.get());
 }
 
 void Desktop::Draw() {
   compositor_->NotifyStart();
-  window_->DrawTree();
+  window_->layer()->DrawTree();
   compositor_->NotifyEnd();
 }
 
 bool Desktop::OnMouseEvent(const MouseEvent& event) {
   return window_->HandleMouseEvent(event);
 }
 
 bool Desktop::OnKeyEvent(const KeyEvent& event) {
   return window_->HandleKeyEvent(event);
 }
@@ skipping 14 matching lines @@
 // static
 Desktop* Desktop::GetInstance() {
   if (!instance_) {
     instance_ = new Desktop;
     instance_->window_->Init();
   }
   return instance_;
 }
 
 }  // namespace aura