Revert 50784 - Canvas refactoring part 3....

views/controls/table/table_view.cc

 // Copyright (c) 2010 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/table_view.h"
 
 #include <commctrl.h>
 #include <windowsx.h>
 
 #include <algorithm>
 
 #include "app/l10n_util.h"
 #include "app/l10n_util_win.h"
 #include "app/resource_bundle.h"
 #include "app/table_model.h"
 #include "base/i18n/rtl.h"
 #include "base/string_util.h"
 #include "base/win_util.h"
-#include "gfx/canvas_skia.h"
+#include "gfx/canvas.h"
 #include "gfx/favicon_size.h"
 #include "gfx/font.h"
 #include "gfx/icon_util.h"
 #include "skia/ext/skia_utils_win.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "third_party/skia/include/core/SkColorFilter.h"
 #include "views/controls/native/native_view_host.h"
 #include "views/controls/table/table_view_observer.h"
 
 namespace {
@@ skipping 1120 matching lines @@
   if (alt_text_.empty())
     return;
 
   HDC dc = GetDC(GetNativeControlHWND());
   gfx::Font font = GetAltTextFont();
   gfx::Rect bounds = GetAltTextBounds();
   gfx::CanvasSkia canvas(bounds.width(), bounds.height(), false);
   // Pad by 1 for halo.
   canvas.DrawStringWithHalo(alt_text_, font, SK_ColorDKGRAY, SK_ColorWHITE, 1,
                             1, bounds.width() - 2, bounds.height() - 2,
-                            gfx::CanvasSkia::DefaultCanvasTextAlignment());
+                            gfx::Canvas::DefaultCanvasTextAlignment());
   canvas.getTopPlatformDevice().drawToHDC(dc, bounds.x(), bounds.y(), NULL);
   ReleaseDC(GetNativeControlHWND(), dc);
 }
 
 LRESULT TableView::OnCustomDraw(NMLVCUSTOMDRAW* draw_info) {
   switch (draw_info->nmcd.dwDrawStage) {
     case CDDS_PREPAINT: {
       return CDRF_NOTIFYITEMDRAW;
     }
     case CDDS_ITEMPREPAINT: {
@@ skipping 417 matching lines @@
 }
 
 void TableSelectionIterator::UpdateModelIndexFromViewIndex() {
   if (view_index_ == -1)
     model_index_ = -1;
   else
     model_index_ = table_view_->ViewToModel(view_index_);
 }
 
 }  // namespace views