Make View::Paint use ui::PaintRecorder to access PaintContext's canvas

chrome/browser/ui/views/location_bar/page_action_image_view.cc

 // Copyright (c) 2012 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/ui/views/location_bar/page_action_image_view.h"
 
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/extensions/extension_action.h"
 #include "chrome/browser/platform_util.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/sessions/session_tab_helper.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/views/location_bar/location_bar_view.h"
 #include "extensions/browser/extension_registry.h"
 #include "ui/accessibility/ax_view_state.h"
+#include "ui/compositor/paint_context.h"
 #include "ui/events/event.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/image/image.h"
 
 // static
 const char PageActionImageView::kViewClassName[] = "PageActionImageView";
 
 PageActionImageView::PageActionImageView(LocationBarView* owner,
                                          ExtensionAction* page_action,
                                          Browser* browser)
@@ skipping 74 matching lines @@
   SetTooltipText(base::UTF8ToUTF16(tooltip_));
 
   // Set the image.
   gfx::Image icon = view_controller_->GetIcon(contents);
   if (!icon.IsEmpty())
     SetImage(*icon.ToImageSkia());
 
   SetVisible(true);
 }
 
-void PageActionImageView::PaintChildren(const PaintContext& context) {
+void PageActionImageView::PaintChildren(const ui::PaintContext& context) {
   View::PaintChildren(context);
   int tab_id = SessionTabHelper::IdForTab(GetCurrentWebContents());
   if (tab_id >= 0) {
     gfx::Canvas* canvas = context.canvas();
     view_controller_->extension_action()->PaintBadge(
         canvas, GetLocalBounds(), tab_id);
   }
 }
 
 void PageActionImageView::UpdateState() {
@@ skipping 25 matching lines @@
   return this;
 }
 
 views::MenuButton* PageActionImageView::GetContextMenuButton() {
   return NULL;  // No menu button for page action views.
 }
 
 content::WebContents* PageActionImageView::GetCurrentWebContents() const {
   return owner_->GetWebContents();
 }