ChromeCanvas->gfx::Canvas

chrome/browser/autocomplete/autocomplete_popup_view_win.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 "chrome/browser/autocomplete/autocomplete_popup_view_win.h"
 
 // TODO(deanm): Clean up these includes, not going to fight it now.
 #include <atlbase.h>
 #include <atlapp.h>
 #include <atlcrack.h>
 #include <atlmisc.h>
 #include <cmath>
 
-#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/command_line.h"
 #include "base/string_util.h"
 #include "base/win_util.h"
 #include "chrome/browser/autocomplete/autocomplete.h"
 #include "chrome/browser/autocomplete/autocomplete_edit.h"
 #include "chrome/browser/autocomplete/autocomplete_popup_model.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/net/dns_global.h"
@@ skipping 637 matching lines @@
     DrawMatchFragments(dc, match.description, match.description_class,
                        description_max_x - description_width, y,
                        description_max_x, status);
   }
   if (starred)
     DrawStar(dc, star_x,
              (line_info_.line_height - star_->height()) / 2 + top_pixel);
 }
 
 void AutocompletePopupViewWin::DrawStar(HDC dc, int x, int y) const {
-  ChromeCanvas canvas(star_->width(), star_->height(), false);
+  gfx::Canvas canvas(star_->width(), star_->height(), false);
   // Make the background completely transparent.
   canvas.drawColor(SK_ColorBLACK, SkPorterDuff::kClear_Mode);
   canvas.DrawBitmapInt(*star_, 0, 0);
   canvas.getTopPlatformDevice().drawToHDC(
       dc, mirroring_context_->GetLeft(x, x + star_->width()), y, NULL);
 }
 
 // static
 AutocompletePopupView* AutocompletePopupView::CreatePopupView(
     const gfx::Font& font,
     AutocompleteEditViewWin* edit_view,
     AutocompleteEditModel* edit_model,
     Profile* profile,
     AutocompletePopupPositioner* popup_positioner) {
   if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kEnableOmnibox2)) {
     return new AutocompletePopupContentsView(font, edit_view, edit_model,
                                              profile, popup_positioner);
   }
   return new AutocompletePopupViewWin(font, edit_view, edit_model, profile);
 }