diff options
| author | thakis <thakis@chromium.org> | 2015-09-16 19:48:48 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-09-17 02:49:24 +0000 |
| commit | 35b19f7d5d7b7b68878d6c766e93e148f8b06998 (patch) | |
| tree | 546289030a5e80740af920e59ce31827d907bd2a /components/mus/public/cpp/util.h | |
| parent | eef6f20ef572c4c128612384a63384aaa7d23fe7 (diff) | |
| download | chromium_src-35b19f7d5d7b7b68878d6c766e93e148f8b06998.zip chromium_src-35b19f7d5d7b7b68878d6c766e93e148f8b06998.tar.gz chromium_src-35b19f7d5d7b7b68878d6c766e93e148f8b06998.tar.bz2 | |
Revert of Mandoline UI Process: Update namespaces and file names (patchset #9 id:150001 of https://codereview.chromium.org/1340983002/ )
Reason for revert:
Speculative, might've broken mojo_apptests on http://build.chromium.org/p/chromium.linux/builders/Linux%20GN/builds/32066
Original issue's description:
> Mandoline UI Process: Update namespaces and file names
>
> This CL updates namespaces in components/mus to mus from mojo, surfaces, gles2, and view_manager.
>
> BUG=531533
> TBR=jam@chromium.org for trivial pdf_viewer change.
>
> Committed: https://crrev.com/49b0d73f3ebb4801fc518751145504af3a2f70ed
> Cr-Commit-Position: refs/heads/master@{#349229}
TBR=sky@chromium.org,fsamuel@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=531533
Review URL: https://codereview.chromium.org/1351013002
Cr-Commit-Position: refs/heads/master@{#349332}
Diffstat (limited to 'components/mus/public/cpp/util.h')
| -rw-r--r-- | components/mus/public/cpp/util.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/components/mus/public/cpp/util.h b/components/mus/public/cpp/util.h index c9cd91f..96f8eeb 100644 --- a/components/mus/public/cpp/util.h +++ b/components/mus/public/cpp/util.h @@ -15,7 +15,7 @@ #undef LoWord #endif -namespace mus { +namespace mojo { inline uint16_t HiWord(uint32_t id) { return static_cast<uint16_t>((id >> 16) & 0xFFFF); @@ -25,6 +25,6 @@ inline uint16_t LoWord(uint32_t id) { return static_cast<uint16_t>(id & 0xFFFF); } -} // namespace mus +} // namespace mojo #endif // COMPONENTS_MUS_PUBLIC_CPP_UTIL_H_ |