3 files changed, 0 insertions, 15 deletions
diff --git a/views/widget/root_view.cc b/views/widget/root_view.cc
index cdc44a8..ce9cc7a 100644
--- a/views/widget/root_view.cc
+++ b/views/widget/root_view.cc
@@ -157,13 +157,11 @@ std::string RootView::GetClassName() const {
 }
 
 void RootView::SchedulePaintInRect(const gfx::Rect& rect) {
-#if defined(COMPOSITOR_2)
   MarkTextureDirty();
   SchedulePaintInternal(rect);
 }
 
 void RootView::SchedulePaintInternal(const gfx::Rect& rect) {
-#endif
   gfx::Rect xrect = ConvertRectToParent(rect);
   gfx::Rect invalid_rect = GetLocalBounds().Intersect(xrect);
   if (!invalid_rect.IsEmpty())
diff --git a/views/widget/root_view.h b/views/widget/root_view.h
index 6bb9795..67c9e40 100644
--- a/views/widget/root_view.h
+++ b/views/widget/root_view.h
@@ -102,9 +102,7 @@ class RootView : public View,
   virtual bool IsVisibleInRootView() const OVERRIDE;
   virtual std::string GetClassName() const OVERRIDE;
   virtual void SchedulePaintInRect(const gfx::Rect& rect) OVERRIDE;
-#if defined(COMPOSITOR_2)
   virtual void SchedulePaintInternal(const gfx::Rect& rect) OVERRIDE;
-#endif
   virtual bool OnMousePressed(const MouseEvent& event) OVERRIDE;
   virtual bool OnMouseDragged(const MouseEvent& event) OVERRIDE;
   virtual void OnMouseReleased(const MouseEvent& event) OVERRIDE;
diff --git a/views/widget/widget.cc b/views/widget/widget.cc
index 94eabd5..8638f7d 100644
--- a/views/widget/widget.cc
+++ b/views/widget/widget.cc
@@ -651,9 +651,6 @@ bool Widget::HasFocusManager() const {
 }
 
 bool Widget::OnNativeWidgetPaintAccelerated(const gfx::Rect& dirty_region) {
-#if !defined(COMPOSITOR_2)
-  return false;
-#else
   if (!compositor_.get())
     return false;
 
@@ -662,18 +659,10 @@ bool Widget::OnNativeWidgetPaintAccelerated(const gfx::Rect& dirty_region) {
   GetRootView()->PaintComposite();
   compositor_->NotifyEnd();
   return true;
-#endif
 }
 
 void Widget::OnNativeWidgetPaint(gfx::Canvas* canvas) {
   GetRootView()->Paint(canvas);
-#if !defined(COMPOSITOR_2)
-  if (compositor_.get()) {
-    compositor_->NotifyStart();
-    root_view_->PaintComposite(compositor_.get());
-    compositor_->NotifyEnd();
-  }
-#endif
 }
 
 int Widget::GetNonClientComponent(const gfx::Point& point) {