summaryrefslogtreecommitdiffstats
path: root/ash/shell.h
diff options
context:
space:
mode:
authorsky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-05-15 18:32:23 +0000
committersky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-05-15 18:32:23 +0000
commit1b4c747749bc8cc46ed2b9006d2f82b6c511e7c4 (patch)
treedadc320dc0f37c5dd756aaee193a72b8697c09b8 /ash/shell.h
parent9eab79b4434f1f4346767257af80f066116706f5 (diff)
downloadchromium_src-1b4c747749bc8cc46ed2b9006d2f82b6c511e7c4.zip
chromium_src-1b4c747749bc8cc46ed2b9006d2f82b6c511e7c4.tar.gz
chromium_src-1b4c747749bc8cc46ed2b9006d2f82b6c511e7c4.tar.bz2
Makes construction of (ash)RemoteWindowTreeHostWin explicit
I need to do this as I need to pass in state to the constructor and I can't do that with lazy construction. This makes creation a little saner anyway. I'm not happy about the static setting the HWND. I'll see if I can clean that up later. BUG=none TEST=none R=ananta@chromium.org Review URL: https://codereview.chromium.org/277753002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@270747 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/shell.h')
-rw-r--r--ash/shell.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/ash/shell.h b/ash/shell.h
index df906c2..e889131 100644
--- a/ash/shell.h
+++ b/ash/shell.h
@@ -126,6 +126,7 @@ class ShelfItemDelegateManager;
class ShelfModel;
class ShelfWindowWatcher;
class ShellDelegate;
+struct ShellInitParams;
class ShellObserver;
class SlowAnimationEventFilter;
class StatusAreaWidget;
@@ -174,7 +175,7 @@ class ASH_EXPORT Shell : public SystemModalContainerEventFilterDelegate,
// A shell must be explicitly created so that it can call |Init()| with the
// delegate set. |delegate| can be NULL (if not required for initialization).
// Takes ownership of |delegate|.
- static Shell* CreateInstance(ShellDelegate* delegate);
+ static Shell* CreateInstance(const ShellInitParams& init_params);
// Should never be called before |CreateInstance()|.
static Shell* GetInstance();
@@ -581,7 +582,7 @@ class ASH_EXPORT Shell : public SystemModalContainerEventFilterDelegate,
explicit Shell(ShellDelegate* delegate);
virtual ~Shell();
- void Init();
+ void Init(const ShellInitParams& init_params);
// Initializes virtual keyboard controller.
void InitKeyboard();