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

Side by Side 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:
View unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | 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 #include "ash/common/system/chromeos/palette/palette_tool_manager.h" 5 #include "ash/common/system/chromeos/palette/palette_tool_manager.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "ash/common/system/chromeos/palette/palette_tool.h" 9 #include "ash/common/system/chromeos/palette/palette_tool.h"
10 #include "base/bind.h" 10 #include "base/bind.h"
11 #include "base/metrics/histogram_macros.h" 11 #include "base/metrics/histogram_macros.h"
12 #include "ui/gfx/vector_icons_public.h"
12 13
13 namespace ash { 14 namespace ash {
14 15
15 PaletteToolManager::PaletteToolManager(Delegate* delegate) 16 PaletteToolManager::PaletteToolManager(Delegate* delegate)
16 : delegate_(delegate) { 17 : delegate_(delegate) {
17 DCHECK(delegate_); 18 DCHECK(delegate_);
18 } 19 }
19 20
20 PaletteToolManager::~PaletteToolManager() {} 21 PaletteToolManager::~PaletteToolManager() {}
21 22
(...skipping 116 matching lines...) Expand 10 before | Expand all | Expand 10 after
138 PaletteTool* PaletteToolManager::FindToolById(PaletteToolId tool_id) { 139 PaletteTool* PaletteToolManager::FindToolById(PaletteToolId tool_id) {
139 for (std::unique_ptr<PaletteTool>& tool : tools_) { 140 for (std::unique_ptr<PaletteTool>& tool : tools_) {
140 if (tool->GetToolId() == tool_id) 141 if (tool->GetToolId() == tool_id)
141 return tool.get(); 142 return tool.get();
142 } 143 }
143 144
144 return nullptr; 145 return nullptr;
145 } 146 }
146 147
147 } // namespace ash 148 } // namespace ash
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698