Remove even more ATL dependencies.

views/controls/table/group_table_view.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/table/group_table_view.h"
 
 #include "app/gfx/chrome_canvas.h"
+#include "base/compiler_specific.h"
 #include "base/message_loop.h"
 #include "base/task.h"
 
 namespace views {
 
 static const COLORREF kSeparatorLineColor = RGB(208, 208, 208);
 static const int kSeparatorLineThickness = 1;
 
 const char GroupTableView::kViewClassName[] = "views/GroupTableView";
 
 GroupTableView::GroupTableView(GroupTableModel* model,
                                const std::vector<TableColumn>& columns,
                                TableTypes table_type,
                                bool single_selection,
                                bool resizable_columns,
                                bool autosize_columns)
     : TableView(model, columns, table_type, false, resizable_columns,
                 autosize_columns),
     model_(model),
-    sync_selection_factory_(this) {
+    ALLOW_THIS_IN_INITIALIZER_LIST(sync_selection_factory_(this)) {
 }
 
 GroupTableView::~GroupTableView() {
 }
 
 void GroupTableView::SyncSelection() {
   int index = 0;
   int row_count = model_->RowCount();
   GroupRange group_range;
   while (index < row_count) {
@@ skipping 120 matching lines @@
   if (sync_selection_factory_.empty()) {
     MessageLoop::current()->PostTask(FROM_HERE,
         sync_selection_factory_.NewRunnableMethod(
             &GroupTableView::SyncSelection));
   }
   TableView::OnSelectedStateChanged();
 }
 
 // Draws the line separator betweens the groups.
 void GroupTableView::PostPaint(int model_row, int column, bool selected,
-                               const CRect& bounds, HDC hdc) {
+                               const gfx::Rect& bounds, HDC hdc) {
   GroupRange group_range;
   model_->GetGroupRangeForItem(model_row, &group_range);
 
   // We always paint a vertical line at the end of the last cell.
   HPEN hPen = CreatePen(PS_SOLID, kSeparatorLineThickness, kSeparatorLineColor);
   HPEN hPenOld = (HPEN) SelectObject(hdc, hPen);
-  int x = static_cast<int>(bounds.right - kSeparatorLineThickness);
-  MoveToEx(hdc, x, bounds.top, NULL);
-  LineTo(hdc, x, bounds.bottom);
+  int x = static_cast<int>(bounds.right() - kSeparatorLineThickness);
+  MoveToEx(hdc, x, bounds.y(), NULL);
+  LineTo(hdc, x, bounds.bottom());
 
   // We paint a separator line after the last item of a group.
   if (model_row == (group_range.start + group_range.length - 1)) {
-    int y = static_cast<int>(bounds.bottom - kSeparatorLineThickness);
+    int y = static_cast<int>(bounds.bottom() - kSeparatorLineThickness);
     MoveToEx(hdc, 0, y, NULL);
-    LineTo(hdc, bounds.Width(), y);
+    LineTo(hdc, bounds.width(), y);
   }
   SelectObject(hdc, hPenOld);
   DeleteObject(hPen);
 }
 
 std::string GroupTableView::GetClassName() const {
   return kViewClassName;
 }
 
 }  // namespace views