chrome/browser/ui/views/location_bar/page_action_image_view.cc - Issue 275183002: patch from issue 218843002

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/views/location_bar/page_action_image_view.cc

Issue 275183002: patch from issue 218843002 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: rebased Created 6 years, 7 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

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

diff --git a/chrome/browser/ui/views/location_bar/page_action_image_view.cc b/chrome/browser/ui/views/location_bar/page_action_image_view.cc

index 793866d884a4797e906d9c149cb6256fd03b9c82..6302fb4c9e5e6d1bbb6f7d44eb7b06cd559debee 100644

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

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

@@ -227,8 +227,9 @@ void PageActionImageView::OnIconUpdated() {

UpdateVisibility(web_contents, current_url_);

}

-void PageActionImageView::PaintChildren(gfx::Canvas* canvas) {

- View::PaintChildren(canvas);

+void PageActionImageView::PaintChildren(gfx::Canvas* canvas,

+ const views::CullSet& cull_set) {

+ View::PaintChildren(canvas, cull_set);

if (current_tab_id_ >= 0)

page_action_->PaintBadge(canvas, GetLocalBounds(), current_tab_id_);

}