| 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_VIEW_MANAGER_PUBLIC_CPP_UTIL_H_ | 5 #ifndef COMPONENTS_MUS_PUBLIC_CPP_UTIL_H_ |
| 6 #define COMPONENTS_VIEW_MANAGER_PUBLIC_CPP_UTIL_H_ | 6 #define COMPONENTS_MUS_PUBLIC_CPP_UTIL_H_ |
| 7 | 7 |
| 8 #include "components/view_manager/public/cpp/types.h" | 8 #include "components/mus/public/cpp/types.h" |
| 9 | 9 |
| 10 // TODO(beng): #$*&@#(@ MacOSX SDK! | 10 // TODO(beng): #$*&@#(@ MacOSX SDK! |
| 11 #if defined(HiWord) | 11 #if defined(HiWord) |
| 12 #undef HiWord | 12 #undef HiWord |
| 13 #endif | 13 #endif |
| 14 #if defined(LoWord) | 14 #if defined(LoWord) |
| 15 #undef LoWord | 15 #undef LoWord |
| 16 #endif | 16 #endif |
| 17 | 17 |
| 18 namespace mojo { | 18 namespace mojo { |
| 19 | 19 |
| 20 inline uint16_t HiWord(uint32_t id) { | 20 inline uint16_t HiWord(uint32_t id) { |
| 21 return static_cast<uint16_t>((id >> 16) & 0xFFFF); | 21 return static_cast<uint16_t>((id >> 16) & 0xFFFF); |
| 22 } | 22 } |
| 23 | 23 |
| 24 inline uint16_t LoWord(uint32_t id) { | 24 inline uint16_t LoWord(uint32_t id) { |
| 25 return static_cast<uint16_t>(id & 0xFFFF); | 25 return static_cast<uint16_t>(id & 0xFFFF); |
| 26 } | 26 } |
| 27 | 27 |
| 28 } // namespace mojo | 28 } // namespace mojo |
| 29 | 29 |
| 30 #endif // COMPONENTS_VIEW_MANAGER_PUBLIC_CPP_UTIL_H_ | 30 #endif // COMPONENTS_MUS_PUBLIC_CPP_UTIL_H_ |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 1344573002:
Mandoline: Rename components/view_manager to components/mus (Closed)
Base URL: https://chromium.googlesource.com/chromium/src.git@master