Merge Compositor and CompositorCC

ui/aura/window.h

 // 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.
 
 #ifndef UI_AURA_WINDOW_H_
 #define UI_AURA_WINDOW_H_
 #pragma once
 
 #include <map>
 #include <string>
@@ skipping 121 matching lines @@
   // LayoutManager may adjust the bounds.
   void SetBounds(const gfx::Rect& new_bounds);
 
   // Returns the target bounds of the window. If the window's layer is
   // not animating, it simply returns the current bounds.
   gfx::Rect GetTargetBounds() const;
 
   // Marks the a portion of window as needing to be painted.
   void SchedulePaintInRect(const gfx::Rect& rect);
 
-  // Sets the contents of the window.
-  void SetCanvas(const SkCanvas& canvas, const gfx::Point& origin);
-
   // Assigns a new external texture to the window's layer.
   void SetExternalTexture(ui::Texture* texture);
 
   // Sets the parent window of the window. If NULL, the window is parented to
   // the root window.
   void SetParent(Window* parent);
 
   // Stacks the specified child of this Window at the front of the z-order.
   void StackChildAtTop(Window* child);
 
@@ skipping 245 matching lines @@
   // TODO(oshima): Consolidcate ViewProp and aura::window property
   // implementation.
   std::map<const char*, void*> prop_map_;
 
   DISALLOW_COPY_AND_ASSIGN(Window);
 };
 
 }  // namespace aura
 
 #endif  // UI_AURA_WINDOW_H_