Remove even more ATL dependencies.

views/controls/scrollbar/bitmap_scroll_bar.cc

 // Copyright (c) 2006-2008 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/controls/scrollbar/bitmap_scroll_bar.h"
 
 #include "app/gfx/chrome_canvas.h"
 #include "app/l10n_util.h"
+#include "base/compiler_specific.h"
 #include "base/message_loop.h"
 #include "grit/generated_resources.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "views/controls/menu/menu.h"
 #include "views/controls/scroll_view.h"
 #include "views/widget/widget.h"
 
 #undef min
 #undef max
 
@@ skipping 11 matching lines @@
 //
 //  A button that activates on mouse pressed rather than released, and that
 //  continues to fire the clicked action as the mouse button remains pressed
 //  down on the button.
 //
 ///////////////////////////////////////////////////////////////////////////////
 class AutorepeatButton : public ImageButton {
  public:
   AutorepeatButton(ButtonListener* listener)
       : ImageButton(listener),
-        repeater_(NewCallback<AutorepeatButton>(this,
-            &AutorepeatButton::NotifyClick)) {
+        ALLOW_THIS_IN_INITIALIZER_LIST(repeater_(
+            NewCallback<AutorepeatButton>(this,
+                                          &AutorepeatButton::NotifyClick))) {
   }
   virtual ~AutorepeatButton() {}
 
  protected:
   virtual bool OnMousePressed(const MouseEvent& event) {
     Button::NotifyClick(event.GetFlags());
     repeater_.Start();
     return true;
   }
 
@@ skipping 196 matching lines @@
 };
 
 } // anonymous namespace
 
 ///////////////////////////////////////////////////////////////////////////////
 // BitmapScrollBar, public:
 
 BitmapScrollBar::BitmapScrollBar(bool horizontal, bool show_scroll_buttons)
     : contents_size_(0),
       contents_scroll_offset_(0),
-      prev_button_(new AutorepeatButton(this)),
-      next_button_(new AutorepeatButton(this)),
-      thumb_(new BitmapScrollBarThumb(this)),
+      ALLOW_THIS_IN_INITIALIZER_LIST(prev_button_(new AutorepeatButton(this))),
+      ALLOW_THIS_IN_INITIALIZER_LIST(next_button_(new AutorepeatButton(this))),
+      ALLOW_THIS_IN_INITIALIZER_LIST(thumb_(new BitmapScrollBarThumb(this))),
       thumb_track_state_(CustomButton::BS_NORMAL),
       last_scroll_amount_(SCROLL_NONE),
-      repeater_(NewCallback<BitmapScrollBar>(this,
-          &BitmapScrollBar::TrackClicked)),
+      ALLOW_THIS_IN_INITIALIZER_LIST(repeater_(
+          NewCallback<BitmapScrollBar>(this,
+                                       &BitmapScrollBar::TrackClicked))),
       context_menu_mouse_position_(0),
       show_scroll_buttons_(show_scroll_buttons),
       ScrollBar(horizontal) {
   if (!show_scroll_buttons_) {
     prev_button_->SetVisible(false);
     next_button_->SetVisible(false);
   }
 
   AddChildView(prev_button_);
   AddChildView(next_button_);
@@ skipping 419 matching lines @@
     thumb_position = thumb_position - (thumb_->GetSize() / 2);
   return (thumb_position * contents_size_) / GetTrackSize();
 }
 
 void BitmapScrollBar::SetThumbTrackState(CustomButton::ButtonState state) {
   thumb_track_state_ = state;
   SchedulePaint();
 }
 
 }  // namespace views