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

Side by Side Diff: trunk/src/mojo/services/public/cpp/view_manager/view_manager.h

Issue 286653003: Revert 270122 "Synchronizes View instances across clients." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 6 years, 7 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
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 MOJO_SERVICES_PUBLIC_CPP_VIEW_MANAGER_VIEW_MANAGER_H_ 5 #ifndef MOJO_SERVICES_PUBLIC_CPP_VIEW_MANAGER_VIEW_MANAGER_H_
6 #define MOJO_SERVICES_PUBLIC_CPP_VIEW_MANAGER_VIEW_MANAGER_H_ 6 #define MOJO_SERVICES_PUBLIC_CPP_VIEW_MANAGER_VIEW_MANAGER_H_
7 7
8 #include <map> 8 #include <map>
9 9
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
11 #include "base/memory/scoped_ptr.h" 11 #include "base/memory/scoped_ptr.h"
12 #include "mojo/public/cpp/bindings/callback.h" 12 #include "mojo/public/cpp/bindings/callback.h"
13 #include "mojo/services/public/cpp/view_manager/view_tree_node.h" 13 #include "mojo/services/public/cpp/view_manager/view_tree_node.h"
14 14
15 namespace mojo { 15 namespace mojo {
16 class Shell; 16 class Shell;
17 namespace services { 17 namespace services {
18 namespace view_manager { 18 namespace view_manager {
19 19
20 class View;
21 class ViewManagerSynchronizer; 20 class ViewManagerSynchronizer;
22 class ViewTreeNode; 21 class ViewTreeNode;
23 22
24 // Approximately encapsulates the View Manager service. 23 // Approximately encapsulates the View Manager service.
25 // Owns a synchronizer that keeps a client model in sync with the service. 24 // Owns a synchronizer that keeps a client model in sync with the service.
26 // Owned by the creator. 25 // Owned by the creator.
27 // 26 //
28 // TODO: displays 27 // TODO: displays
29 class ViewManager { 28 class ViewManager {
30 public: 29 public:
31 explicit ViewManager(Shell* shell); 30 explicit ViewManager(Shell* shell);
32 ~ViewManager(); 31 ~ViewManager();
33 32
34 // Connects to the View Manager service. This method must be called before 33 // Connects to the View Manager service. This method must be called before
35 // using any other View Manager lib class or function. 34 // using any other View Manager lib class or function.
36 // Blocks on establishing the connection and subsequently receiving a node 35 // Blocks on establishing the connection and subsequently receiving a node
37 // tree from the service. 36 // tree from the service.
38 // TODO(beng): blocking is currently achieved by running a nested runloop, 37 // TODO(beng): blocking is currently achieved by running a nested runloop,
39 // which will dispatch all messages on all pipes while blocking. 38 // which will dispatch all messages on all pipes while blocking.
40 // we should instead wait on the client pipe receiving a 39 // we should instead wait on the client pipe receiving a
41 // connection established message. 40 // connection established message.
42 // TODO(beng): this method could optionally not block if supplied a callback. 41 // TODO(beng): this method could optionally not block if supplied a callback.
43 void Init(); 42 void Init();
44 43
45 ViewTreeNode* tree() { return tree_; } 44 ViewTreeNode* tree() { return tree_; }
46 45
47 ViewTreeNode* GetNodeById(TransportNodeId id); 46 ViewTreeNode* GetNodeById(TransportNodeId id);
48 View* GetViewById(TransportViewId id);
49 47
50 private: 48 private:
51 friend class ViewManagerPrivate; 49 friend class ViewManagerPrivate;
52 typedef std::map<TransportNodeId, ViewTreeNode*> IdToNodeMap; 50 typedef std::map<TransportNodeId, ViewTreeNode*> IdToNodeMap;
53 typedef std::map<TransportViewId, View*> IdToViewMap;
54 51
55 Shell* shell_; 52 Shell* shell_;
56 scoped_ptr<ViewManagerSynchronizer> synchronizer_; 53 scoped_ptr<ViewManagerSynchronizer> synchronizer_;
57 ViewTreeNode* tree_; 54 ViewTreeNode* tree_;
58 55
59 IdToNodeMap nodes_; 56 IdToNodeMap nodes_;
60 IdToViewMap views_;
61 57
62 DISALLOW_COPY_AND_ASSIGN(ViewManager); 58 DISALLOW_COPY_AND_ASSIGN(ViewManager);
63 }; 59 };
64 60
65 } // namespace view_manager 61 } // namespace view_manager
66 } // namespace services 62 } // namespace services
67 } // namespace mojo 63 } // namespace mojo
68 64
69 #endif // MOJO_SERVICES_PUBLIC_CPP_VIEW_MANAGER_VIEW_MANAGER_H_ 65 #endif // MOJO_SERVICES_PUBLIC_CPP_VIEW_MANAGER_VIEW_MANAGER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698