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

aura/window.h

 // 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.
 
 #ifndef AURA_WINDOW_H_
 #define AURA_WINDOW_H_
 #pragma once
 
 #include <vector>
 
@@ skipping 69 matching lines @@
   void SetParent(Window* parent);
   Window* parent() { return parent_; }
 
   // Returns true if this Window is the container for toplevel windows.
   virtual bool IsTopLevelWindowContainer() const;
 
   // Move the specified child of this Window to the front of the z-order.
   // TODO(beng): this is (obviously) feeble.
   void MoveChildToFront(Window* child);
 
-  // Draw the window and its children.
-  void DrawTree();
-
   // Tree operations.
   // TODO(beng): Child windows are currently not owned by the hierarchy. We
   //             should change this.
   void AddChild(Window* child);
   void RemoveChild(Window* child);
 
   static void ConvertPointToWindow(Window* source,
                                    Window* target,
                                    gfx::Point* point);
 
@@ skipping 23 matching lines @@
   // The Window does not own this object.
   void set_user_data(void* user_data) { user_data_ = user_data; }
   void* user_data() const { return user_data_; }
 
  private:
   typedef std::vector<Window*> Windows;
 
   // If SchedulePaint has been invoked on the Window the delegate is notified.
   void UpdateLayerCanvas();
 
-  // Draws the Window's contents.
-  void Draw();
-
   // Schedules a paint for the Window's entire bounds.
   void SchedulePaint();
 
   // Overridden from ui::LayerDelegate:
-  virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE;
+  virtual void OnPaintLayer(gfx::Canvas* canvas) OVERRIDE;
 
   WindowDelegate* delegate_;
 
   Visibility visibility_;
 
   scoped_ptr<ui::Layer> layer_;
 
   // Bounds of the window in the desktop's coordinate system.
   gfx::Rect bounds_;
 
   // The Window's parent.
   // TODO(beng): Implement NULL-ness for toplevels.
   Window* parent_;
 
   // Child windows. Topmost is last.
   Windows children_;
 
   int id_;
 
   scoped_ptr<WindowManager> window_manager_;
 
   void* user_data_;
 
   DISALLOW_COPY_AND_ASSIGN(Window);
 };
 
 }  // namespace aura
 
 #endif  // AURA_WINDOW_H_