diff options
| author | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-07 08:17:42 +0000 |
|---|---|---|
| committer | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-07 08:17:42 +0000 |
| commit | 6929154213ec00236e4e123d63ff1f88f458391e (patch) | |
| tree | 3e6354f008c0eaed7cb06faf61a0fbefa57b0fc6 /ui | |
| parent | be32d87d0e255ed03bae17ddefa0a6559765975c (diff) | |
| download | chromium_src-6929154213ec00236e4e123d63ff1f88f458391e.zip chromium_src-6929154213ec00236e4e123d63ff1f88f458391e.tar.gz chromium_src-6929154213ec00236e4e123d63ff1f88f458391e.tar.bz2 | |
Moves common view_manager related aura files to mojo/aura
I'm going to use these files in other examples. I refactored the code slightly to update compositor via a delegate. This way the code can easily (hopefully) be used by view_manager_lib related code.
I'm also making aura::Env extend base::SupportsUserData so that
consumers can add arbitrary key/value pairs to Env.
BUG=365012
TEST=none
R=ben@chromium.org
Review URL: https://codereview.chromium.org/314113011
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@275638 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/aura/env.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/ui/aura/env.h b/ui/aura/env.h index fc83ac8..a4f6766 100644 --- a/ui/aura/env.h +++ b/ui/aura/env.h @@ -7,6 +7,7 @@ #include "base/memory/scoped_ptr.h" #include "base/observer_list.h" +#include "base/supports_user_data.h" #include "ui/aura/aura_export.h" #include "ui/events/event_handler.h" #include "ui/events/event_target.h" @@ -28,7 +29,7 @@ class Window; class WindowTreeHost; // A singleton object that tracks general state within Aura. -class AURA_EXPORT Env : public ui::EventTarget { +class AURA_EXPORT Env : public ui::EventTarget, public base::SupportsUserData { public: // Creates the single Env instance (if it hasn't been created yet). If // |create_event_source| is true a PlatformEventSource is created. |