ash/system/palette/palette_tool.cc - Issue 2732813002: chromeos: Move files in //ash/common to //ash, part 1

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

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

Side by Side Diff: ash/system/palette/palette_tool.cc

Issue 2732813002: chromeos: Move files in //ash/common to //ash, part 1 (Closed)

Patch Set: rebase 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 unified diff | Download patch

OLD	NEW
1 // Copyright 2016 The Chromium Authors. All rights reserved.	1 // Copyright 2016 The Chromium Authors. All rights reserved.

2 // Use of this source code is governed by a BSD-style license that can be	2 // Use of this source code is governed by a BSD-style license that can be

3 // found in the LICENSE file.	3 // found in the LICENSE file.

4	4

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

6	6

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

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

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

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

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

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

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

14 #include "base/memory/ptr_util.h"	14 #include "base/memory/ptr_util.h"

15 #include "ui/gfx/paint_vector_icon.h"	15 #include "ui/gfx/paint_vector_icon.h"

16	16

17 namespace ash {	17 namespace ash {

18	18

19 // static	19 // static

20 void PaletteTool::RegisterToolInstances(PaletteToolManager* tool_manager) {	20 void PaletteTool::RegisterToolInstances(PaletteToolManager* tool_manager) {

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

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

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

(...skipping 11 matching lines...) Expand all Loading...
35	35

36 void PaletteTool::OnDisable() {	36 void PaletteTool::OnDisable() {

37 enabled_ = false;	37 enabled_ = false;

38 }	38 }

39	39

40 const gfx::VectorIcon& PaletteTool::GetActiveTrayIcon() const {	40 const gfx::VectorIcon& PaletteTool::GetActiveTrayIcon() const {

41 return gfx::kNoneIcon;	41 return gfx::kNoneIcon;

42 }	42 }

43	43

44 } // namespace ash	44 } // namespace ash

OLD	NEW

« no previous file with comments | « ash/system/palette/palette_tool.h ('k') | ash/system/palette/palette_tool_manager.h » ('j') | no next file with comments »