Chromium Code Reviews| Index: mojo/services/view_manager/view_manager_connection.h |
| diff --git a/mojo/services/view_manager/view_manager_connection.h b/mojo/services/view_manager/view_manager_connection.h |
| index 6b09498fde4ad69a3c4c46c8a8d7ae37512552e1..88f63f6ceb0e1de4a54a72561ca95e6314bfa96f 100644 |
| --- a/mojo/services/view_manager/view_manager_connection.h |
| +++ b/mojo/services/view_manager/view_manager_connection.h |
| @@ -23,10 +23,16 @@ class Node; |
| class RootNodeManager; |
| class View; |
| +#if defined(OS_WIN) |
| +// Equivalent of NON_EXPORTED_BASE which does not work with the template snafu |
| +// below. |
| +#pragma warning( push) |
| +#pragma warning( disable : 4275) |
| +#endif |
|
cpu_(ooo_6.6-7.5)
2014/05/10 02:42:14
spaces in warnings should be consistent.
ananta
2014/05/10 02:44:25
Removed the spaces.
|
| + |
| // Manages a connection from the client. |
| class MOJO_VIEW_MANAGER_EXPORT ViewManagerConnection |
| - : public ServiceConnection<NON_EXPORTED_BASE(IViewManager), |
| - ViewManagerConnection, |
| + : public ServiceConnection<IViewManager, ViewManagerConnection, |
| RootNodeManager>, |
| public NodeDelegate { |
| public: |
| @@ -128,6 +134,10 @@ class MOJO_VIEW_MANAGER_EXPORT ViewManagerConnection |
| DISALLOW_COPY_AND_ASSIGN(ViewManagerConnection); |
| }; |
| +#if defined(OS_WIN) |
| +#pragma warning( pop ) |
| +#endif |
| + |
| } // namespace view_manager |
| } // namespace services |
| } // namespace mojo |