diff options
| author | ananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-10 01:32:15 +0000 |
|---|---|---|
| committer | ananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-10 01:32:15 +0000 |
| commit | 8ca7c6b6142b787e4ad9746a9f117e1ea3524de9 (patch) | |
| tree | 056985acb9a66d7a86231ec058cbd7d89108530a /mojo/services | |
| parent | bed08f38515671b77bd28bdbcbf38ca5b9952a7e (diff) | |
| download | chromium_src-8ca7c6b6142b787e4ad9746a9f117e1ea3524de9.zip chromium_src-8ca7c6b6142b787e4ad9746a9f117e1ea3524de9.tar.gz chromium_src-8ca7c6b6142b787e4ad9746a9f117e1ea3524de9.tar.bz2 | |
Fix compile error on Win64 due to C++ warning 4275 occurring because an exported class ViewManagerConnection is deriving from a non exported interface IViewManager
BUG=none
R=cpu@chromium.org
TBR=darin
Review URL: https://codereview.chromium.org/271353002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@269471 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'mojo/services')
| -rw-r--r-- | mojo/services/view_manager/view_manager_connection.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/mojo/services/view_manager/view_manager_connection.h b/mojo/services/view_manager/view_manager_connection.h index 51f1642..6b09498 100644 --- a/mojo/services/view_manager/view_manager_connection.h +++ b/mojo/services/view_manager/view_manager_connection.h @@ -8,6 +8,7 @@ #include <set> #include "base/basictypes.h" +#include "base/compiler_specific.h" #include "mojo/public/cpp/shell/service.h" #include "mojo/services/public/interfaces/view_manager/view_manager.mojom.h" #include "mojo/services/view_manager/ids.h" @@ -24,7 +25,8 @@ class View; // Manages a connection from the client. class MOJO_VIEW_MANAGER_EXPORT ViewManagerConnection - : public ServiceConnection<IViewManager, ViewManagerConnection, + : public ServiceConnection<NON_EXPORTED_BASE(IViewManager), + ViewManagerConnection, RootNodeManager>, public NodeDelegate { public: |