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

Side by Side Diff: components/mus/ws/connection_manager.h

Issue 1782123003: Makes WindowTree take the AccessPolicy (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: merge Created 4 years, 9 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
« no previous file with comments | « components/mus/ws/access_policy.h ('k') | components/mus/ws/connection_manager.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 COMPONENTS_MUS_WS_CONNECTION_MANAGER_H_ 5 #ifndef COMPONENTS_MUS_WS_CONNECTION_MANAGER_H_
6 #define COMPONENTS_MUS_WS_CONNECTION_MANAGER_H_ 6 #define COMPONENTS_MUS_WS_CONNECTION_MANAGER_H_
7 7
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include <map> 10 #include <map>
(...skipping 13 matching lines...) Expand all
24 #include "components/mus/ws/server_window_observer.h" 24 #include "components/mus/ws/server_window_observer.h"
25 #include "components/mus/ws/user_id_tracker.h" 25 #include "components/mus/ws/user_id_tracker.h"
26 #include "components/mus/ws/window_manager_factory_registry.h" 26 #include "components/mus/ws/window_manager_factory_registry.h"
27 #include "mojo/converters/surfaces/custom_surface_converter.h" 27 #include "mojo/converters/surfaces/custom_surface_converter.h"
28 #include "mojo/public/cpp/bindings/array.h" 28 #include "mojo/public/cpp/bindings/array.h"
29 #include "mojo/public/cpp/bindings/binding.h" 29 #include "mojo/public/cpp/bindings/binding.h"
30 30
31 namespace mus { 31 namespace mus {
32 namespace ws { 32 namespace ws {
33 33
34 class AccessPolicy;
34 class ConnectionManagerDelegate; 35 class ConnectionManagerDelegate;
35 class DisplayManager; 36 class DisplayManager;
36 class ServerWindow; 37 class ServerWindow;
37 class WindowManagerState; 38 class WindowManagerState;
38 class WindowTree; 39 class WindowTree;
39 class WindowTreeBinding; 40 class WindowTreeBinding;
40 41
41 // ConnectionManager manages the set of connections to the window server (all 42 // ConnectionManager manages the set of connections to the window server (all
42 // the WindowTrees) as well as providing the root of the hierarchy. 43 // the WindowTrees) as well as providing the root of the hierarchy.
43 class ConnectionManager : public ServerWindowDelegate, 44 class ConnectionManager : public ServerWindowDelegate,
(...skipping 20 matching lines...) Expand all
64 const WindowId& id, 65 const WindowId& id,
65 const std::map<std::string, std::vector<uint8_t>>& properties); 66 const std::map<std::string, std::vector<uint8_t>>& properties);
66 67
67 // Returns the id for the next WindowTree. 68 // Returns the id for the next WindowTree.
68 ConnectionSpecificId GetAndAdvanceNextConnectionId(); 69 ConnectionSpecificId GetAndAdvanceNextConnectionId();
69 70
70 // See description of WindowTree::Embed() for details. This assumes 71 // See description of WindowTree::Embed() for details. This assumes
71 // |transport_window_id| is valid. 72 // |transport_window_id| is valid.
72 WindowTree* EmbedAtWindow(ServerWindow* root, 73 WindowTree* EmbedAtWindow(ServerWindow* root,
73 const UserId& user_id, 74 const UserId& user_id,
74 mojom::WindowTreeClientPtr client); 75 mojom::WindowTreeClientPtr client,
76 scoped_ptr<AccessPolicy> access_policy);
75 77
76 // Adds |tree_impl_ptr| to the set of known trees. Use DestroyTree() to 78 // Adds |tree_impl_ptr| to the set of known trees. Use DestroyTree() to
77 // destroy the tree. 79 // destroy the tree.
78 WindowTree* AddTree(scoped_ptr<WindowTree> tree_impl_ptr, 80 WindowTree* AddTree(scoped_ptr<WindowTree> tree_impl_ptr,
79 scoped_ptr<WindowTreeBinding> binding, 81 scoped_ptr<WindowTreeBinding> binding,
80 mojom::WindowTreePtr tree_ptr); 82 mojom::WindowTreePtr tree_ptr);
81 WindowTree* CreateTreeForWindowManager(Display* display, 83 WindowTree* CreateTreeForWindowManager(Display* display,
82 mojom::WindowManagerFactory* factory, 84 mojom::WindowManagerFactory* factory,
83 ServerWindow* root, 85 ServerWindow* root,
84 const UserId& user_id); 86 const UserId& user_id);
(...skipping 204 matching lines...) Expand 10 before | Expand all | Expand 10 after
289 291
290 WindowManagerFactoryRegistry window_manager_factory_registry_; 292 WindowManagerFactoryRegistry window_manager_factory_registry_;
291 293
292 DISALLOW_COPY_AND_ASSIGN(ConnectionManager); 294 DISALLOW_COPY_AND_ASSIGN(ConnectionManager);
293 }; 295 };
294 296
295 } // namespace ws 297 } // namespace ws
296 } // namespace mus 298 } // namespace mus
297 299
298 #endif // COMPONENTS_MUS_WS_CONNECTION_MANAGER_H_ 300 #endif // COMPONENTS_MUS_WS_CONNECTION_MANAGER_H_
OLDNEW
« no previous file with comments | « components/mus/ws/access_policy.h ('k') | components/mus/ws/connection_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698