diff options
author | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-22 21:47:58 +0000 |
---|---|---|
committer | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-22 21:47:58 +0000 |
commit | fa69f2b688dd5fcefe3484aaa9b7d99175bc1bb9 (patch) | |
tree | 1d9c539da5aab9ef57883d5f871d91bffdbd9f6b /ash/shell_init_params.h | |
parent | 15b4290d997471abce904d693291808e8205ddd3 (diff) | |
download | chromium_src-fa69f2b688dd5fcefe3484aaa9b7d99175bc1bb9.zip chromium_src-fa69f2b688dd5fcefe3484aaa9b7d99175bc1bb9.tar.gz chromium_src-fa69f2b688dd5fcefe3484aaa9b7d99175bc1bb9.tar.bz2 |
Makes Env contain a ContextFactory
This way when creating the Compositor we can supply the ContextFactory
from the thread local Env to it. This is part of making aura thread
safe.
BUG=none
TEST=none
R=ben@chromium.org
Review URL: https://codereview.chromium.org/296053009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@272332 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/shell_init_params.h')
-rw-r--r-- | ash/shell_init_params.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/ash/shell_init_params.h b/ash/shell_init_params.h index 52b894e..9a681fae 100644 --- a/ash/shell_init_params.h +++ b/ash/shell_init_params.h @@ -13,6 +13,10 @@ #include "ash/ash_export.h" +namespace ui { +class ContextFactory; +} + namespace ash { class ShellDelegate; @@ -23,6 +27,8 @@ struct ASH_EXPORT ShellInitParams { ShellDelegate* delegate; + ui::ContextFactory* context_factory; + #if defined(OS_WIN) HWND remote_hwnd; #endif |