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

Side by Side Diff: src/platform/window_manager/x_connection.h

Issue 501116: wm: Update namespace and header define guards. (Closed)
Patch Set: move using directive inside of namespace for consistency Created 11 years 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
OLDNEW
1 // Copyright (c) 2009 The Chromium OS Authors. All rights reserved. 1 // Copyright (c) 2009 The Chromium OS 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 __PLATFORM_WINDOW_MANAGER_X_CONNECTION_H__ 5 #ifndef WINDOW_MANAGER_X_CONNECTION_H_
6 #define __PLATFORM_WINDOW_MANAGER_X_CONNECTION_H__ 6 #define WINDOW_MANAGER_X_CONNECTION_H_
7 7
8 #include <map> 8 #include <map>
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
11 11
12 extern "C" { 12 extern "C" {
13 #include <X11/Xlib.h> 13 #include <X11/Xlib.h>
14 #include <X11/Xutil.h> 14 #include <X11/Xutil.h>
15 } 15 }
16 16
17 #include "base/basictypes.h" 17 #include "base/basictypes.h"
18 #include "base/scoped_ptr.h" 18 #include "base/scoped_ptr.h"
19 19
20 namespace chromeos { 20 namespace window_manager {
21 21
22 typedef ::Atom XAtom; 22 typedef ::Atom XAtom;
23 typedef ::Window XWindow; 23 typedef ::Window XWindow;
24 24
25 class ByteMap; // from util.h 25 class ByteMap; // from util.h
26 template<class T> class Stacker; // from util.h 26 template<class T> class Stacker; // from util.h
27 27
28 // This is an abstract base class representing a connection to the X 28 // This is an abstract base class representing a connection to the X
29 // server. 29 // server.
30 class XConnection { 30 class XConnection {
(...skipping 239 matching lines...) Expand 10 before | Expand all | Expand 10 after
270 270
271 private: 271 private:
272 virtual bool GrabServerImpl() = 0; 272 virtual bool GrabServerImpl() = 0;
273 virtual bool UngrabServerImpl() = 0; 273 virtual bool UngrabServerImpl() = 0;
274 274
275 bool server_grabbed_; 275 bool server_grabbed_;
276 276
277 DISALLOW_COPY_AND_ASSIGN(XConnection); 277 DISALLOW_COPY_AND_ASSIGN(XConnection);
278 }; 278 };
279 279
280 }; // namespace chromeos 280 }; // namespace window_manager
281 281
282 #endif 282 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698