ui/display/chromeos/x11/native_display_delegate_x11.h - Issue 215233002: Update ui/display to use primitive types as defined in stdint.h

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: ui/display/chromeos/x11/native_display_delegate_x11.h

Issue 215233002: Update ui/display to use primitive types as defined in stdint.h (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Rebased Created 6 years, 9 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

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,