| 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_ids.h" | 5 #include "ash/system/palette/palette_ids.h" |
| 6 #include "base/logging.h" | 6 #include "base/logging.h" |
| 7 | 7 |
| 8 namespace ash { | 8 namespace ash { |
| 9 | 9 |
| 10 std::string PaletteToolIdToString(PaletteToolId tool_id) { | 10 std::string PaletteToolIdToString(PaletteToolId tool_id) { |
| 11 switch (tool_id) { | 11 switch (tool_id) { |
| 12 case PaletteToolId::NONE: | 12 case PaletteToolId::NONE: |
| 13 return "NONE"; | 13 return "NONE"; |
| 14 case PaletteToolId::CREATE_NOTE: | 14 case PaletteToolId::CREATE_NOTE: |
| 15 return "CREATE_NOTE"; | 15 return "CREATE_NOTE"; |
| (...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 67 return is_switched ? PALETTE_MODE_LASER_POINTER_SWITCHED | 67 return is_switched ? PALETTE_MODE_LASER_POINTER_SWITCHED |
| 68 : PALETTE_MODE_LASER_POINTER_CANCELLED; | 68 : PALETTE_MODE_LASER_POINTER_CANCELLED; |
| 69 } else if (tool_id == PaletteToolId::MAGNIFY) { | 69 } else if (tool_id == PaletteToolId::MAGNIFY) { |
| 70 return is_switched ? PALETTE_MODE_MAGNIFY_SWITCHED | 70 return is_switched ? PALETTE_MODE_MAGNIFY_SWITCHED |
| 71 : PALETTE_MODE_MAGNIFY_CANCELLED; | 71 : PALETTE_MODE_MAGNIFY_CANCELLED; |
| 72 } | 72 } |
| 73 return type; | 73 return type; |
| 74 } | 74 } |
| 75 | 75 |
| 76 } // namespace ash | 76 } // namespace ash |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 2732813002:
chromeos: Move files in //ash/common to //ash, part 1 (Closed)
