ash/frame/caption_buttons/frame_caption_button_container_view_unittest.cc - Issue 1566563002: Vectorize CrOS window control icons.

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: ash/frame/caption_buttons/frame_caption_button_container_view_unittest.cc

Issue 1566563002: Vectorize CrOS window control icons. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: dummy GetIcon impl in TestToolbarModel Created 4 years, 11 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 | « ash/frame/caption_buttons/frame_caption_button_container_view.cc ('k') | ash/frame/caption_buttons/frame_size_button_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: ash/frame/caption_buttons/frame_caption_button_container_view_unittest.cc

diff --git a/ash/frame/caption_buttons/frame_caption_button_container_view_unittest.cc b/ash/frame/caption_buttons/frame_caption_button_container_view_unittest.cc

index 4ca54361c1990a3078a7d320d8365a049e4cef06..ff87fd457aa91a995e669299224865ba376725c5 100644

--- a/ash/frame/caption_buttons/frame_caption_button_container_view_unittest.cc

+++ b/ash/frame/caption_buttons/frame_caption_button_container_view_unittest.cc

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

#include "ash/wm/maximize_mode/maximize_mode_controller.h"

#include "grit/ash_resources.h"

#include "ui/gfx/geometry/rect.h"

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

#include "ui/views/widget/widget.h"

#include "ui/views/widget/widget_delegate.h"

@@ -77,7 +78,7 @@ class FrameCaptionButtonContainerViewTest : public ash::test::AshTestBase {

GetAshLayoutSize(AshLayoutSize::NON_BROWSER_CAPTION_BUTTON));

for (int icon = 0; icon < CAPTION_BUTTON_ICON_COUNT; ++icon) {

container->SetButtonImage(static_cast<CaptionButtonIcon>(icon),

- IDR_AURA_WINDOW_CONTROL_ICON_CLOSE);

+ gfx::VectorIconId::WINDOW_CONTROL_CLOSE);

}