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

Unified Diff: ash/shell_init_params.h

Issue 2808723004: Renames WmShell to ShellPort (Closed)
Patch Set: feedback Created 3 years, 8 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
Index: ash/shell_init_params.h
diff --git a/ash/shell_init_params.h b/ash/shell_init_params.h
index d2f01e6b07661690b63aba9210b4b5f458c6f13d..7a10cd73fca1aa504e356c05e46b919518fff6d7 100644
--- a/ash/shell_init_params.h
+++ b/ash/shell_init_params.h
@@ -22,11 +22,11 @@ class ContextFactory;
namespace ash {
class ShellDelegate;
+class ShellPort;
struct ASH_EXPORT ShellInitParams {
- // Shell takes ownership of |wm_shell|, if null WmShellAura is created.
- // TODO(sky): temporary, will eventually go away.
- WmShell* wm_shell = nullptr;
+ // Shell takes ownership of |shell_port|, if null ShellPortClassic is created.
+ ShellPort* shell_port = nullptr;
// Shell takes ownership of |primary_window_tree_host|. This is only used
// by mash.
aura::WindowTreeHostMus* primary_window_tree_host = nullptr;

Powered by Google App Engine
This is Rietveld 408576698