chrome/browser/ui/views/toolbar/toolbar_actions_bar_bubble_views.cc - Issue 2733823003: Move final vector icons out of ui/gfx/vector_icons/ and remove the

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/toolbar/toolbar_actions_bar_bubble_views.cc

Issue 2733823003: Move final vector icons out of ui/gfx/vector_icons/ and remove the (Closed)

Patch Set: fix deps Created 3 years, 9 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:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/ui/views/location_bar/star_view.cc ('k') | chrome/browser/ui/views/toolbar/toolbar_actions_bar_bubble_views_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/views/toolbar/toolbar_actions_bar_bubble_views.cc

diff --git a/chrome/browser/ui/views/toolbar/toolbar_actions_bar_bubble_views.cc b/chrome/browser/ui/views/toolbar/toolbar_actions_bar_bubble_views.cc

index 662e6d50eb97795e601da10cbf5ed8e2a728a764..37f717363203cc618f06b07c68ecb145f09643f7 100644

--- a/chrome/browser/ui/views/toolbar/toolbar_actions_bar_bubble_views.cc

+++ b/chrome/browser/ui/views/toolbar/toolbar_actions_bar_bubble_views.cc

@@ -11,7 +11,6 @@

#include "ui/base/resource/resource_bundle.h"

#include "ui/gfx/color_palette.h"

#include "ui/gfx/paint_vector_icon.h"

-#include "ui/gfx/vector_icons_public.h"

#include "ui/views/controls/button/label_button.h"

#include "ui/views/controls/image_view.h"

#include "ui/views/controls/label.h"

@@ -47,12 +46,11 @@ views::View* ToolbarActionsBarBubbleViews::CreateExtraView() {

if (!extra_view_info)

return nullptr;

- gfx::VectorIconId resource_id = extra_view_info->resource_id;

std::unique_ptr<views::ImageView> icon;

- if (resource_id != gfx::VectorIconId::VECTOR_ICON_NONE) {

+ if (extra_view_info->resource) {

icon.reset(new views::ImageView);

- icon->SetImage(

- gfx::CreateVectorIcon(resource_id, kIconSize, gfx::kChromeIconGrey));

+ icon->SetImage(gfx::CreateVectorIcon(*extra_view_info->resource, kIconSize,

+ gfx::kChromeIconGrey));

}

std::unique_ptr<views::Label> label;