Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(71)

Unified Diff: ash/shell.h

Issue 277753002: Makes construction of (ash)RemoteWindowTreeHostWin explicit (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix Created 6 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/host/ash_window_tree_host_x11.cc ('k') | ash/shell.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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();
« no previous file with comments | « ash/host/ash_window_tree_host_x11.cc ('k') | ash/shell.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698