ash/wm/power_button_controller.cc - Issue 2731873002: Revert "chromeos: Move files in //ash/common to //ash, part 1"

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/wm/power_button_controller.cc

Issue 2731873002: Revert "chromeos: Move files in //ash/common to //ash, part 1" (Closed)

Patch Set: Created 3 years, 9 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:

Index: ash/wm/power_button_controller.cc

diff --git a/ash/wm/power_button_controller.cc b/ash/wm/power_button_controller.cc

index 6fc2e40375a82e31fd3fe843c0d4493b29241f31..104d612dd7877cead0d573f7c6cd46fcc22d069e 100644

--- a/ash/wm/power_button_controller.cc

+++ b/ash/wm/power_button_controller.cc

@@ -7,13 +7,13 @@

#include "ash/common/accelerators/accelerator_controller.h"

#include "ash/common/ash_switches.h"

#include "ash/common/session/session_state_delegate.h"

+#include "ash/common/system/chromeos/audio/tray_audio.h"

+#include "ash/common/system/tray/system_tray.h"

#include "ash/common/wm/maximize_mode/maximize_mode_controller.h"

#include "ash/common/wm_shell.h"

#include "ash/public/cpp/shell_window_ids.h"

#include "ash/shell.h"

-#include "ash/system/audio/tray_audio.h"

-#include "ash/system/power/tablet_power_button_controller.h"

-#include "ash/system/tray/system_tray.h"

+#include "ash/system/chromeos/power/tablet_power_button_controller.h"

#include "ash/wm/lock_state_controller.h"

#include "ash/wm/session_state_animator.h"

#include "base/command_line.h"