ChromeCanvas->gfx::Canvas

chrome/browser/views/options/options_group_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 <vsstyle.h>
 #include <vssym32.h>
 
 #include "chrome/browser/views/options/options_group_view.h"
 
-#include "app/gfx/chrome_canvas.h"
-#include "app/gfx/chrome_font.h"
+#include "app/gfx/canvas.h"
+#include "app/gfx/font.h"
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "base/gfx/native_theme.h"
 #include "grit/locale_settings.h"
 #include "grit/generated_resources.h"
 #include "views/grid_layout.h"
 #include "views/controls/label.h"
 #include "views/controls/separator.h"
 #include "views/standard_layout.h"
 
@@ skipping 33 matching lines @@
   SchedulePaint();
 }
 
 int OptionsGroupView::GetContentsWidth() const {
   return contents_->width();
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // OptionsGroupView, views::View overrides:
 
-void OptionsGroupView::Paint(ChromeCanvas* canvas) {
+void OptionsGroupView::Paint(gfx::Canvas* canvas) {
   if (highlighted_) {
     COLORREF infocolor = GetSysColor(COLOR_INFOBK);
     SkColor background_color = SkColorSetRGB(GetRValue(infocolor),
                                              GetGValue(infocolor),
                                              GetBValue(infocolor));
     int y_offset = kUnrelatedControlVerticalSpacing / 2;
     canvas->FillRectInt(background_color, 0, 0, width(),
                         height() - y_offset);
   }
 }
@@ skipping 51 matching lines @@
     const int single_column_layout_id = 1;
     column_set = layout->AddColumnSet(single_column_layout_id);
     column_set->AddColumn(GridLayout::FILL, GridLayout::CENTER, 1,
                           GridLayout::USE_PREF, 0, 0);
 
     separator_ = new views::Separator;
     layout->StartRow(0, single_column_layout_id);
     layout->AddView(separator_);
   }
 }