ash/common/system/chromeos/palette/palette_tool_manager.cc - Issue 2148573002: Add palette tray to ash.

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 2148573002: Add palette tray to ash. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@stylus-tool-structure

Patch Set: Nits Created 4 years, 5 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 188cb58f063bf3b7ca66d9bb48720384ea1d20be..c3b0d3dd8bbc6c5c8e30c450a5c4beeb12c18d8c 100644

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

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

@@ -72,7 +72,7 @@ PaletteToolId PaletteToolManager::GetActiveTool(PaletteGroup group) {

gfx::VectorIconId PaletteToolManager::GetActiveTrayIcon(PaletteToolId tool_id) {

PaletteTool* tool = FindToolById(tool_id);

if (!tool)

- return gfx::VectorIconId::VECTOR_ICON_NONE;

+ return gfx::VectorIconId::PALETTE_TRAY_ICON_DEFAULT;

return tool->GetActiveTrayIcon();

}

« no previous file with comments | « ash/ash_strings.grd ('k') | ash/common/system/chromeos/palette/palette_tray.h » ('j') | no next file with comments »