Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(139)

Side by Side Diff: ash/system/palette/palette_tool_manager.h

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
« no previous file with comments | « ash/system/palette/palette_tool.cc ('k') | ash/system/palette/palette_tool_manager.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 #ifndef ASH_COMMON_SYSTEM_CHROMEOS_PALETTE_PALETTE_TOOL_MANAGER_H_ 5 #ifndef ASH_SYSTEM_PALETTE_PALETTE_TOOL_MANAGER_H_
6 #define ASH_COMMON_SYSTEM_CHROMEOS_PALETTE_PALETTE_TOOL_MANAGER_H_ 6 #define ASH_SYSTEM_PALETTE_PALETTE_TOOL_MANAGER_H_
7 7
8 #include <map> 8 #include <map>
9 #include <memory> 9 #include <memory>
10 #include <vector> 10 #include <vector>
11 11
12 #include "ash/ash_export.h" 12 #include "ash/ash_export.h"
13 #include "ash/common/system/chromeos/palette/palette_ids.h" 13 #include "ash/system/palette/palette_ids.h"
14 #include "ash/common/system/chromeos/palette/palette_tool.h" 14 #include "ash/system/palette/palette_tool.h"
15 #include "base/callback.h" 15 #include "base/callback.h"
16 #include "base/macros.h" 16 #include "base/macros.h"
17 17
18 namespace views { 18 namespace views {
19 class View; 19 class View;
20 } 20 }
21 21
22 namespace ash { 22 namespace ash {
23 23
24 class PaletteTool; 24 class PaletteTool;
(...skipping 90 matching lines...) Expand 10 before | Expand all | Expand 10 after
115 std::map<PaletteGroup, PaletteTool*> active_tools_; 115 std::map<PaletteGroup, PaletteTool*> active_tools_;
116 116
117 // Owned list of all tools. 117 // Owned list of all tools.
118 std::vector<std::unique_ptr<PaletteTool>> tools_; 118 std::vector<std::unique_ptr<PaletteTool>> tools_;
119 119
120 DISALLOW_COPY_AND_ASSIGN(PaletteToolManager); 120 DISALLOW_COPY_AND_ASSIGN(PaletteToolManager);
121 }; 121 };
122 122
123 } // namespace ash 123 } // namespace ash
124 124
125 #endif // ASH_COMMON_SYSTEM_CHROMEOS_PALETTE_PALETTE_TOOL_MANAGER_H_ 125 #endif // ASH_SYSTEM_PALETTE_PALETTE_TOOL_MANAGER_H_
OLDNEW
« no previous file with comments | « ash/system/palette/palette_tool.cc ('k') | ash/system/palette/palette_tool_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698