ash/common/wm_shell.cc - Issue 2497123002: chromeos: Move device shutdown handling out of chrome into ash

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: ash/common/wm_shell.cc

Issue 2497123002: chromeos: Move device shutdown handling out of chrome into ash (Closed)

Patch Set: rebase Created 4 years, 1 month ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: ash/common/wm_shell.cc

diff --git a/ash/common/wm_shell.cc b/ash/common/wm_shell.cc

index ea70a167df056f2f475408b424058d1e3af3e8d2..98cd1ce22545b277ab2d90a4e63d492738722820 100644

--- a/ash/common/wm_shell.cc

+++ b/ash/common/wm_shell.cc

@@ -21,6 +21,7 @@

#include "ash/common/shelf/shelf_model.h"

#include "ash/common/shelf/shelf_window_watcher.h"

#include "ash/common/shell_delegate.h"

+#include "ash/common/shutdown_controller.h"

#include "ash/common/system/brightness_control_delegate.h"

#include "ash/common/system/keyboard_brightness_control_delegate.h"

#include "ash/common/system/locale/locale_notification_controller.h"

@@ -248,6 +249,7 @@ WmShell::WmShell(std::unique_ptr<ShellDelegate> shell_delegate)

new_window_client_(base::MakeUnique<NewWindowClientProxy>(

delegate_->GetShellConnector())),

shelf_controller_(base::MakeUnique<ShelfController>()),

+ shutdown_controller_(base::MakeUnique<ShutdownController>()),

system_tray_controller_(base::MakeUnique<SystemTrayController>(

delegate_->GetShellConnector())),

system_tray_notifier_(base::MakeUnique<SystemTrayNotifier>()),

« no previous file with comments | « ash/common/wm_shell.h ('k') | ash/mus/manifest.json » ('j') | no next file with comments »