| Index: ui/display/chromeos/x11/native_display_delegate_x11.h
|
| diff --git a/ui/display/chromeos/x11/native_display_delegate_x11.h b/ui/display/chromeos/x11/native_display_delegate_x11.h
|
| index 88ba506e585df0ff11ca73ca000f9b9e4a4c9730..d4b608d15d3d4dd6c88919bfe9fcb57bc180cae8 100644
|
| --- a/ui/display/chromeos/x11/native_display_delegate_x11.h
|
| +++ b/ui/display/chromeos/x11/native_display_delegate_x11.h
|
| @@ -5,10 +5,11 @@
|
| #ifndef UI_DISPLAY_CHROMEOS_X11_NATIVE_DISPLAY_DELEGATE_X11_H_
|
| #define UI_DISPLAY_CHROMEOS_X11_NATIVE_DISPLAY_DELEGATE_X11_H_
|
|
|
| +#include <stdint.h>
|
| +
|
| #include <map>
|
| #include <vector>
|
|
|
| -#include "base/basictypes.h"
|
| #include "base/compiler_specific.h"
|
| #include "base/event_types.h"
|
| #include "base/memory/scoped_ptr.h"
|
| @@ -70,7 +71,7 @@ class DISPLAY_EXPORT NativeDisplayDelegateX11 : public NativeDisplayDelegate {
|
| virtual void GrabServer() OVERRIDE;
|
| virtual void UngrabServer() OVERRIDE;
|
| virtual void SyncWithServer() OVERRIDE;
|
| - virtual void SetBackgroundColor(uint32 color_argb) OVERRIDE;
|
| + virtual void SetBackgroundColor(uint32_t color_argb) OVERRIDE;
|
| virtual void ForceDPMSOn() OVERRIDE;
|
| virtual std::vector<DisplaySnapshot*> GetOutputs() OVERRIDE;
|
| virtual void AddMode(const DisplaySnapshot& output,
|
|
|