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

Unified Diff: ash/mus/bridge/wm_shell_mus.h

Issue 2694623016: chromeos: Makes AshTestBase/Helper target mash when appropriate (Closed)
Patch Set: comment Created 3 years, 10 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/mus/bridge/wm_shell_mus.h
diff --git a/ash/mus/bridge/wm_shell_mus.h b/ash/mus/bridge/wm_shell_mus.h
index 6894a323316be4715f491079fa2cb8ecb42a80d7..e94d2881fe0840efe39e6198bde17c3a5ccb1bd9 100644
--- a/ash/mus/bridge/wm_shell_mus.h
+++ b/ash/mus/bridge/wm_shell_mus.h
@@ -36,10 +36,13 @@ class WmShellMusTestApi;
// WmShell implementation for mus.
class WmShellMus : public WmShell {
public:
+ // If |create_session_state_delegate_stub| is true SessionStateDelegateStub is
+ // created. If false, the SessionStateDelegate from Shell is used.
WmShellMus(WmWindow* primary_root_window,
std::unique_ptr<ShellDelegate> shell_delegate,
WindowManager* window_manager,
- views::PointerWatcherEventRouter* pointer_watcher_event_router);
+ views::PointerWatcherEventRouter* pointer_watcher_event_router,
+ bool create_session_state_delegate_stub);
msw 2017/02/19 21:49:20 Can we just rely on the shell_delegate for this? S
sky 2017/02/21 17:06:50 Shell::Init() creates a SessionStateDelegate: s
msw 2017/02/22 06:25:48 Got it, it'd be nice to summarize that in a bug or
~WmShellMus() override;
static WmShellMus* Get();

Powered by Google App Engine
This is Rietveld 408576698