| Index: webrtc/base/window.h
 | 
| diff --git a/webrtc/base/window.h b/webrtc/base/window.h
 | 
| index 9f4381a610bff096096f96a07ad1eb6789268c86..b1f1724e63fa18606251bc414589a53f8077abe4 100644
 | 
| --- a/webrtc/base/window.h
 | 
| +++ b/webrtc/base/window.h
 | 
| @@ -40,7 +40,7 @@ class WindowId {
 | 
|    typedef unsigned int WindowT;
 | 
|  #endif
 | 
|  
 | 
| -  static WindowId Cast(uint64 id) {
 | 
| +  static WindowId Cast(uint64_t id) {
 | 
|  #if defined(WEBRTC_WIN)
 | 
|      return WindowId(reinterpret_cast<WindowId::WindowT>(id));
 | 
|  #else
 | 
| @@ -48,11 +48,11 @@ class WindowId {
 | 
|  #endif
 | 
|    }
 | 
|  
 | 
| -  static uint64 Format(const WindowT& id) {
 | 
| +  static uint64_t Format(const WindowT& id) {
 | 
|  #if defined(WEBRTC_WIN)
 | 
| -    return static_cast<uint64>(reinterpret_cast<uintptr_t>(id));
 | 
| +    return static_cast<uint64_t>(reinterpret_cast<uintptr_t>(id));
 | 
|  #else
 | 
| -    return static_cast<uint64>(id);
 | 
| +    return static_cast<uint64_t>(id);
 | 
|  #endif
 | 
|    }
 | 
|  
 | 
| 
 |