Remove COMPOSITOR_2 flag, old compositor code.

views/widget/widget.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 "views/widget/widget.h"
 
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "base/utf_string_conversions.h"
 #include "ui/base/l10n/l10n_font_util.h"
@@ skipping 633 matching lines @@
 
 void Widget::OnNativeWidgetEndUserBoundsChange() {
   widget_delegate_->OnWindowEndUserBoundsChange();
 }
 
 bool Widget::HasFocusManager() const {
   return !!focus_manager_.get();
 }
 
 bool Widget::OnNativeWidgetPaintAccelerated(const gfx::Rect& dirty_region) {
-#if !defined(COMPOSITOR_2)
-  return false;
-#else
   if (!compositor_.get())
     return false;
 
   compositor_->NotifyStart();
   GetRootView()->PaintToTexture(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) {
   return non_client_view_->NonClientHitTest(point);
 }
 
 bool Widget::OnKeyEvent(const KeyEvent& event) {
   return static_cast<internal::RootView*>(GetRootView())->OnKeyEvent(event);
 }
 
@@ skipping 185 matching lines @@
       native_widget_->CenterWindow(non_client_view_->GetPreferredSize());
     } else {
       // Use the supplied initial bounds.
       SetBoundsConstrained(bounds, NULL);
     }
   }
 }
 
 
 }  // namespace views