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

Side by Side Diff: mojo/services/view_manager/view_manager_connection.h

Issue 271353002: Fix compile error on Win64 due to C++ warning 4275 occurring because an exported class ViewManagerC… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
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
« no previous file with comments | « no previous file | no next file » | 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 MOJO_SERVICES_VIEW_MANAGER_VIEW_MANAGER_CONNECTION_H_ 5 #ifndef MOJO_SERVICES_VIEW_MANAGER_VIEW_MANAGER_CONNECTION_H_
6 #define MOJO_SERVICES_VIEW_MANAGER_VIEW_MANAGER_CONNECTION_H_ 6 #define MOJO_SERVICES_VIEW_MANAGER_VIEW_MANAGER_CONNECTION_H_
7 7
8 #include <set> 8 #include <set>
9 9
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
11 #include "base/compiler_specific.h"
11 #include "mojo/public/cpp/shell/service.h" 12 #include "mojo/public/cpp/shell/service.h"
12 #include "mojo/services/public/interfaces/view_manager/view_manager.mojom.h" 13 #include "mojo/services/public/interfaces/view_manager/view_manager.mojom.h"
13 #include "mojo/services/view_manager/ids.h" 14 #include "mojo/services/view_manager/ids.h"
14 #include "mojo/services/view_manager/node_delegate.h" 15 #include "mojo/services/view_manager/node_delegate.h"
15 #include "mojo/services/view_manager/view_manager_export.h" 16 #include "mojo/services/view_manager/view_manager_export.h"
16 17
17 namespace mojo { 18 namespace mojo {
18 namespace services { 19 namespace services {
19 namespace view_manager { 20 namespace view_manager {
20 21
21 class Node; 22 class Node;
22 class RootNodeManager; 23 class RootNodeManager;
23 class View; 24 class View;
24 25
25 // Manages a connection from the client. 26 // Manages a connection from the client.
26 class MOJO_VIEW_MANAGER_EXPORT ViewManagerConnection 27 class MOJO_VIEW_MANAGER_EXPORT ViewManagerConnection
27 : public ServiceConnection<IViewManager, ViewManagerConnection, 28 : public ServiceConnection<NON_EXPORTED_BASE(IViewManager),
29 ViewManagerConnection,
28 RootNodeManager>, 30 RootNodeManager>,
29 public NodeDelegate { 31 public NodeDelegate {
30 public: 32 public:
31 ViewManagerConnection(); 33 ViewManagerConnection();
32 virtual ~ViewManagerConnection(); 34 virtual ~ViewManagerConnection();
33 35
34 TransportConnectionId id() const { return id_; } 36 TransportConnectionId id() const { return id_; }
35 37
36 // Invoked when connection is established. 38 // Invoked when connection is established.
37 void Initialize(); 39 void Initialize();
(...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after
124 ViewMap view_map_; 126 ViewMap view_map_;
125 127
126 DISALLOW_COPY_AND_ASSIGN(ViewManagerConnection); 128 DISALLOW_COPY_AND_ASSIGN(ViewManagerConnection);
127 }; 129 };
128 130
129 } // namespace view_manager 131 } // namespace view_manager
130 } // namespace services 132 } // namespace services
131 } // namespace mojo 133 } // namespace mojo
132 134
133 #endif // MOJO_SERVICES_VIEW_MANAGER_VIEW_MANAGER_CONNECTION_H_ 135 #endif // MOJO_SERVICES_VIEW_MANAGER_VIEW_MANAGER_CONNECTION_H_
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698