ash/common/system/chromeos/palette/palette_tool_manager.cc - Issue 2361533002: Fix m54 build caused by bad merge.

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/common/system/chromeos/palette/palette_tool_manager.cc

Issue 2361533002: Fix m54 build caused by bad merge. (Closed)

Patch Set: Created 4 years, 3 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: ash/common/system/chromeos/palette/palette_tool_manager.cc

diff --git a/ash/common/system/chromeos/palette/palette_tool_manager.cc b/ash/common/system/chromeos/palette/palette_tool_manager.cc

index 60c32bd2af715ecec60a4f7c8179d92ddf78a06c..7c1a2cb531df70a9e51c3fec54e3286f311bb38d 100644

--- a/ash/common/system/chromeos/palette/palette_tool_manager.cc

+++ b/ash/common/system/chromeos/palette/palette_tool_manager.cc

@@ -9,6 +9,7 @@

#include "ash/common/system/chromeos/palette/palette_tool.h"

#include "base/bind.h"

#include "base/metrics/histogram_macros.h"

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

namespace ash {

« no previous file with comments | « no previous file | no next file » | no next file with comments »