Index: chrome/views/event.h |
=================================================================== |
--- chrome/views/event.h (revision 15583) |
+++ chrome/views/event.h (working copy) |
@@ -6,13 +6,11 @@ |
#define CHROME_VIEWS_EVENT_H_ |
#include "base/basictypes.h" |
+#include "base/gfx/point.h" |
#if defined(OS_LINUX) |
-#include <gdk/gdk.h> |
+typedef struct _GdkEventKey GdkEventKey; |
#endif |
- |
-#include "base/gfx/point.h" |
- |
class OSExchangeData; |
namespace views { |
@@ -218,7 +216,7 @@ |
} |
private: |
- DISALLOW_EVIL_CONSTRUCTORS(MouseEvent); |
+ DISALLOW_COPY_AND_ASSIGN(MouseEvent); |
}; |
//////////////////////////////////////////////////////////////////////////////// |
@@ -235,7 +233,7 @@ |
// Create a new key event |
KeyEvent(EventType type, int ch, int repeat_count, int message_flags); |
#elif defined(OS_LINUX) |
- KeyEvent(GdkEventKey* event); |
+ explicit KeyEvent(GdkEventKey* event); |
#endif |
int GetCharacter() const { |