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

Side by Side Diff: src/platform/window_manager/window.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_WINDOW_H__ 5 #ifndef WINDOW_MANAGER_WINDOW_H_
6 #define __PLATFORM_WINDOW_MANAGER_WINDOW_H__ 6 #define WINDOW_MANAGER_WINDOW_H_
7 7
8 extern "C" { 8 extern "C" {
9 #include <X11/Xlib.h> 9 #include <X11/Xlib.h>
10 } 10 }
11 #include <gtest/gtest_prod.h> // for FRIEND_TEST() macro 11 #include <gtest/gtest_prod.h> // for FRIEND_TEST() macro
12 #include <set> 12 #include <set>
13 #include <string> 13 #include <string>
14 #include <vector> 14 #include <vector>
15 15
16 #include "base/basictypes.h" 16 #include "base/basictypes.h"
17 #include "base/logging.h" 17 #include "base/logging.h"
18 #include "base/scoped_ptr.h" 18 #include "base/scoped_ptr.h"
19 #include "chromeos/obsolete_logging.h" 19 #include "chromeos/obsolete_logging.h"
20 #include "window_manager/atom_cache.h" // for Atom enum 20 #include "window_manager/atom_cache.h" // for Atom enum
21 #include "window_manager/clutter_interface.h" 21 #include "window_manager/clutter_interface.h"
22 #include "window_manager/wm_ipc.h" 22 #include "window_manager/wm_ipc.h"
23 23
24 typedef ::Window XWindow; 24 typedef ::Window XWindow;
25 25
26 namespace chromeos { 26 namespace window_manager {
27 27
28 class Shadow; 28 class Shadow;
29 template<class T> class Stacker; // from util.h 29 template<class T> class Stacker; // from util.h
30 class WindowManager; 30 class WindowManager;
31 31
32 // A client window. 32 // A client window.
33 // 33 //
34 // Because we use Xcomposite, there are (at least) two locations for a 34 // Because we use Xcomposite, there are (at least) two locations for a
35 // given window that we need to keep track of: 35 // given window that we need to keep track of:
36 // 36 //
(...skipping 305 matching lines...) Expand 10 before | Expand all | Expand 10 after
342 bool wm_state_maximized_vert_; 342 bool wm_state_maximized_vert_;
343 bool wm_state_modal_; 343 bool wm_state_modal_;
344 344
345 // Chrome window state, as exposed in the window's _CHROME_STATE 345 // Chrome window state, as exposed in the window's _CHROME_STATE
346 // property. 346 // property.
347 std::set<XAtom> chrome_state_xatoms_; 347 std::set<XAtom> chrome_state_xatoms_;
348 348
349 DISALLOW_COPY_AND_ASSIGN(Window); 349 DISALLOW_COPY_AND_ASSIGN(Window);
350 }; 350 };
351 351
352 } // namespace chromeos 352 } // namespace window_manager
353 353
354 #endif 354 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698