ash/common/system/chromeos/palette/palette_tool.cc - Issue 2291913002: Allow the user to cancel the capture region action, and show its active status in the tray.

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.cc

Issue 2291913002: Allow the user to cancel the capture region action, and show its active status in the tray. (Closed)

Patch Set: Address comments 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.cc

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

index c7a97da2e96473cfdcf854b90a930d52ec74cb3e..db0a68f42ff67bc30fa5620cf027fc0a5f543656 100644

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

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

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

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

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

-#include "ash/common/system/chromeos/palette/tools/capture_region_action.h"

+#include "ash/common/system/chromeos/palette/tools/capture_region_mode.h"

#include "ash/common/system/chromeos/palette/tools/capture_screen_action.h"

#include "ash/common/system/chromeos/palette/tools/create_note_action.h"

#include "ash/common/system/chromeos/palette/tools/laser_pointer_mode.h"

@@ -18,7 +18,7 @@ namespace ash {

// static

void PaletteTool::RegisterToolInstances(PaletteToolManager* tool_manager) {

- tool_manager->AddTool(base::MakeUnique<CaptureRegionAction>(tool_manager));

+ tool_manager->AddTool(base::MakeUnique<CaptureRegionMode>(tool_manager));

tool_manager->AddTool(base::MakeUnique<CaptureScreenAction>(tool_manager));

tool_manager->AddTool(base::MakeUnique<CreateNoteAction>(tool_manager));

tool_manager->AddTool(base::MakeUnique<LaserPointerMode>(tool_manager));