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

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

Issue 754433003: Update from https://crrev.com/305340 (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 6 years, 1 month 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
« no previous file with comments | « tools/valgrind/gtest_exclude/content_unittests.gtest.txt ('k') | ui/compositor/compositor.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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_FOREIGN_WINDOW_MANAGER_H_ 5 #ifndef UI_BASE_X_X11_FOREIGN_WINDOW_MANAGER_H_
6 #define UI_BASE_X_X11_FOREIGN_WINDOW_MANAGER_H_ 6 #define UI_BASE_X_X11_FOREIGN_WINDOW_MANAGER_H_
7 7
8 #include <map> 8 #include <map>
9 #include <vector> 9 #include <vector>
10 10
11 #include "base/basictypes.h" 11 #include "base/basictypes.h"
12 #include "base/compiler_specific.h"
12 #include "ui/base/ui_base_export.h" 13 #include "ui/base/ui_base_export.h"
13 #include "ui/gfx/x/x11_types.h" 14 #include "ui/gfx/x/x11_types.h"
14 15
15 // A process wide singleton for selecting events on X windows which were not 16 // A process wide singleton for selecting events on X windows which were not
16 // created by Chrome. 17 // created by Chrome.
17 template <typename T> struct DefaultSingletonTraits; 18 template <typename T> struct DefaultSingletonTraits;
18 19
19 namespace ui { 20 namespace ui {
20 21
21 // Manages the events that Chrome has selected on X windows which were not 22 // Manages the events that Chrome has selected on X windows which were not
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
59 60
60 typedef std::vector<Request> RequestVector; 61 typedef std::vector<Request> RequestVector;
61 std::map<XID, RequestVector> request_map_; 62 std::map<XID, RequestVector> request_map_;
62 63
63 DISALLOW_COPY_AND_ASSIGN(XForeignWindowManager); 64 DISALLOW_COPY_AND_ASSIGN(XForeignWindowManager);
64 }; 65 };
65 66
66 } // namespace ui 67 } // namespace ui
67 68
68 #endif // UI_BASE_X_X11_FOREIGN_WINDOW_MANAGER_H_ 69 #endif // UI_BASE_X_X11_FOREIGN_WINDOW_MANAGER_H_
OLDNEW
« no previous file with comments | « tools/valgrind/gtest_exclude/content_unittests.gtest.txt ('k') | ui/compositor/compositor.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698