Index: ash/shell.h |
diff --git a/ash/shell.h b/ash/shell.h |
index df906c23b53ba11ed3acbd5e3ed9a98c5e4776ff..e889131b95beca21793ddde3e57a98c6cf693080 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(); |