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

chrome/browser/ui/views/toolbar/toolbar_action_view.cc

 // Copyright 2013 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/toolbar/toolbar_action_view.h"
 
 #include <string>
 
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/sessions/session_tab_helper.h"
 #include "chrome/browser/themes/theme_service.h"
 #include "chrome/browser/themes/theme_service_factory.h"
 #include "chrome/browser/ui/toolbar/toolbar_action_view_controller.h"
 #include "chrome/browser/ui/toolbar/toolbar_actions_bar.h"
 #include "chrome/browser/ui/view_ids.h"
 #include "chrome/grit/generated_resources.h"
 #include "content/public/browser/notification_source.h"
 #include "grit/theme_resources.h"
 #include "ui/accessibility/ax_view_state.h"
 #include "ui/base/resource/resource_bundle.h"
+#include "ui/compositor/paint_context.h"
 #include "ui/events/event.h"
 #include "ui/gfx/image/image_skia.h"
 #include "ui/gfx/image/image_skia_operations.h"
 #include "ui/gfx/image/image_skia_source.h"
 #include "ui/resources/grit/ui_resources.h"
 #include "ui/views/controls/button/label_button_border.h"
 
 using views::LabelButtonBorder;
 
 namespace {
@@ skipping 68 matching lines @@
 void ToolbarActionView::ViewHierarchyChanged(
     const ViewHierarchyChangedDetails& details) {
   if (details.is_add && !called_register_command_ && GetFocusManager()) {
     view_controller_->RegisterCommand();
     called_register_command_ = true;
   }
 
   MenuButton::ViewHierarchyChanged(details);
 }
 
-void ToolbarActionView::PaintChildren(const PaintContext& context) {
+void ToolbarActionView::PaintChildren(const ui::PaintContext& context) {
   View::PaintChildren(context);
   view_controller_->PaintExtra(context.canvas(), GetLocalBounds(),
                                GetCurrentWebContents());
 }
 
 void ToolbarActionView::OnPaintBorder(gfx::Canvas* canvas) {
   if (!wants_to_run_)
     views::MenuButton::OnPaintBorder(canvas);
   else
     wants_to_run_border_->Paint(*this, canvas);
@@ skipping 171 matching lines @@
     views::MenuButton* reference_view =
         static_cast<views::MenuButton*>(GetReferenceViewForPopup());
     pressed_lock_.reset(new views::MenuButton::PressedLock(reference_view));
   }
 }
 
 void ToolbarActionView::OnPopupClosed() {
   delegate_->SetPopupOwner(nullptr);
   pressed_lock_.reset();  // Unpress the menu button if it was pressed.
 }