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

Unified Diff: ash/shell.cc

Issue 2863623005: ash: Instantiate UserActivityForwarder for --mus. (Closed)
Patch Set: check for aura::Env::Mode::MUS Created 3 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 | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/shell.cc
diff --git a/ash/shell.cc b/ash/shell.cc
index 8cdfec9c861977a5c88ca323d51d7546de3f1125..d85b142b488bfd0633561feda47a253d3c906dbf 100644
--- a/ash/shell.cc
+++ b/ash/shell.cc
@@ -983,8 +983,10 @@ void Shell::Init(const ShellInitParams& init_params) {
power_button_controller_->OnDisplayModeChanged(
display_configurator_->cached_displays());
+ // Forward user activity from the window server to |user_activity_detector_|.
// The connector is unavailable in some tests.
- if (config == Config::MASH && shell_delegate_->GetShellConnector()) {
+ if (aura::Env::GetInstance()->mode() == aura::Env::Mode::MUS &&
+ shell_delegate_->GetShellConnector()) {
ui::mojom::UserActivityMonitorPtr user_activity_monitor;
shell_delegate_->GetShellConnector()->BindInterface(ui::mojom::kServiceName,
&user_activity_monitor);
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698