ChromeCanvas->gfx::Canvas

chrome/browser/views/blocked_popup_container.cc

 // Copyright (c) 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.
 
 // Implementation of BlockedPopupContainer and its corresponding View
 // class. The BlockedPopupContainer is the sort of Model class which owns the
 // blocked popups' TabContents (but like most Chromium interface code, it there
 // isn't a strict Model/View separation), and BlockedPopupContainerView
 // presents the user interface controls, creates and manages the popup menu.
 
 #include "chrome/browser/views/blocked_popup_container.h"
 
 #include <math.h>
 
-#include "app/gfx/chrome_canvas.h"
+#include "app/gfx/canvas.h"
 #include "app/gfx/path.h"
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "base/string_util.h"
 #include "chrome/browser/extensions/extension_function_dispatcher.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/common/notification_service.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/pref_service.h"
@@ skipping 92 matching lines @@
 void BlockedPopupContainerView::UpdateLabel() {
   size_t blocked_popups = container_->GetBlockedPopupCount();
   popup_count_label_->SetText((blocked_popups > 0) ?
       l10n_util::GetStringF(IDS_POPUPS_BLOCKED_COUNT,
                             UintToWString(blocked_popups)) :
       l10n_util::GetString(IDS_POPUPS_UNBLOCKED));
   Layout();
   SchedulePaint();
 }
 
-void BlockedPopupContainerView::Paint(ChromeCanvas* canvas) {
+void BlockedPopupContainerView::Paint(gfx::Canvas* canvas) {
   // Draw the standard background.
   View::Paint(canvas);
 
   SkRect rect;
   rect.set(0, 0, SkIntToScalar(width()), SkIntToScalar(height()));
 
   // Draw the border
   SkPaint border_paint;
   border_paint.setFlags(SkPaint::kAntiAlias_Flag);
   border_paint.setStyle(SkPaint::kStroke_Style);
@@ skipping 544 matching lines @@
   }
 
   // Erase the popup and update the UI.
   UnblockedPopups::iterator next_popup = unblocked_popups_.erase(i);
   if (blocked_popups_.empty() && unblocked_popups_.empty())
     HideSelf();
   else
     container_view_->UpdateLabel();
   return next_popup;
 }