Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(23)

Side by Side Diff: ui/base/x/x11_util.h

Issue 14139029: Fix a couple of style nits: (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 8 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:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « base/message_pump_linux.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef UI_BASE_X_X11_UTIL_H_ 5 #ifndef UI_BASE_X_X11_UTIL_H_
6 #define UI_BASE_X_X11_UTIL_H_ 6 #define UI_BASE_X_X11_UTIL_H_
7 7
8 // This file declares utility functions for X11 (Linux only). 8 // This file declares utility functions for X11 (Linux only).
9 // 9 //
10 // These functions do not require the Xlib headers to be included (which is why 10 // These functions do not require the Xlib headers to be included (which is why
11 // we use a void* for Visual*). The Xlib headers are highly polluting so we try 11 // we use a void* for Visual*). The Xlib headers are highly polluting so we try
12 // hard to limit their spread into the rest of the code. 12 // hard to limit their spread into the rest of the code.
13 13
14 #include <string> 14 #include <string>
15 #include <vector> 15 #include <vector>
16 16
17 #include "base/basictypes.h" 17 #include "base/basictypes.h"
18 #include "base/event_types.h" 18 #include "base/event_types.h"
19 #include "ui/base/events/event_constants.h" 19 #include "ui/base/events/event_constants.h"
20 #include "ui/base/keycodes/keyboard_codes.h" 20 #include "ui/base/keycodes/keyboard_codes.h"
21 #include "ui/base/ui_export.h" 21 #include "ui/base/ui_export.h"
22 #include "ui/gfx/point.h" 22 #include "ui/gfx/point.h"
23 23
24 typedef unsigned long Atom; 24 typedef unsigned long Atom;
25 typedef unsigned long XID; 25 typedef unsigned long XID;
26 typedef unsigned long XSharedMemoryId; // ShmSeg in the X headers. 26 typedef unsigned long XSharedMemoryId; // ShmSeg in the X headers.
27 typedef struct _XDisplay Display; 27 typedef struct _XDisplay Display;
28 typedef unsigned long Cursor; 28 typedef unsigned long Cursor;
29 typedef struct _XcursorImage XcursorImage; 29 typedef struct _XcursorImage XcursorImage;
30 typedef union _XEvent XEvent;
30 typedef struct _XImage XImage; 31 typedef struct _XImage XImage;
31 typedef struct _XGC *GC; 32 typedef struct _XGC *GC;
32 33
33 #if defined(TOOLKIT_GTK) 34 #if defined(TOOLKIT_GTK)
34 typedef struct _GdkDrawable GdkWindow; 35 typedef struct _GdkDrawable GdkWindow;
35 typedef struct _GtkWidget GtkWidget; 36 typedef struct _GtkWidget GtkWidget;
36 typedef struct _GtkWindow GtkWindow; 37 typedef struct _GtkWindow GtkWindow;
37 #endif 38 #endif
38 39
39 namespace gfx { 40 namespace gfx {
(...skipping 360 matching lines...) Expand 10 before | Expand all | Expand 10 after
400 private: 401 private:
401 ::Cursor cursor_; 402 ::Cursor cursor_;
402 Display* display_; 403 Display* display_;
403 404
404 DISALLOW_COPY_AND_ASSIGN(XScopedCursor); 405 DISALLOW_COPY_AND_ASSIGN(XScopedCursor);
405 }; 406 };
406 407
407 } // namespace ui 408 } // namespace ui
408 409
409 #endif // UI_BASE_X_X11_UTIL_H_ 410 #endif // UI_BASE_X_X11_UTIL_H_
OLDNEW
« no previous file with comments | « base/message_pump_linux.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698