| OLD | NEW |
|---|
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 COMPONENTS_MUS_COMMON_UTIL_H_ | 5 #ifndef SERVICES_UI_COMMON_UTIL_H_ |
| 6 #define COMPONENTS_MUS_COMMON_UTIL_H_ | 6 #define SERVICES_UI_COMMON_UTIL_H_ |
| 7 | 7 |
| 8 #include <stdint.h> | 8 #include <stdint.h> |
| 9 | 9 |
| 10 #include "components/mus/common/types.h" | 10 #include "services/ui/common/types.h" |
| 11 | 11 |
| 12 // TODO(beng): #$*&@#(@ MacOSX SDK! | 12 // TODO(beng): #$*&@#(@ MacOSX SDK! |
| 13 #if defined(HiWord) | 13 #if defined(HiWord) |
| 14 #undef HiWord | 14 #undef HiWord |
| 15 #endif | 15 #endif |
| 16 #if defined(LoWord) | 16 #if defined(LoWord) |
| 17 #undef LoWord | 17 #undef LoWord |
| 18 #endif | 18 #endif |
| 19 | 19 |
| 20 namespace mus { | 20 namespace mus { |
| 21 | 21 |
| 22 inline uint16_t HiWord(uint32_t id) { | 22 inline uint16_t HiWord(uint32_t id) { |
| 23 return static_cast<uint16_t>((id >> 16) & 0xFFFF); | 23 return static_cast<uint16_t>((id >> 16) & 0xFFFF); |
| 24 } | 24 } |
| 25 | 25 |
| 26 inline uint16_t LoWord(uint32_t id) { | 26 inline uint16_t LoWord(uint32_t id) { |
| 27 return static_cast<uint16_t>(id & 0xFFFF); | 27 return static_cast<uint16_t>(id & 0xFFFF); |
| 28 } | 28 } |
| 29 | 29 |
| 30 } // namespace mus | 30 } // namespace mus |
| 31 | 31 |
| 32 #endif // COMPONENTS_MUS_COMMON_UTIL_H_ | 32 #endif // SERVICES_UI_COMMON_UTIL_H_ |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 2119963002:
Move mus to //services/ui (Closed)
Base URL: https://chromium.googlesource.com/chromium/src.git@master