ash/wm/lock_state_controller.cc - Issue 2734733002: Revert "chromeos: Move files in //ash/common to //ash, part 3"

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/lock_state_controller.cc

Issue 2734733002: Revert "chromeos: Move files in //ash/common to //ash, part 3" (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/lock_state_controller.cc

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

index c71db5bc2d866b2339b3e6e29b6a7b30da2ea13a..293d95a9424f4f3d22d086b52e152166fab11f35 100644

--- a/ash/wm/lock_state_controller.cc

+++ b/ash/wm/lock_state_controller.cc

@@ -8,16 +8,16 @@

#include <string>

#include <utility>

-#include "ash/accessibility_delegate.h"

#include "ash/cancel_mode.h"

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

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

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

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

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

#include "ash/public/interfaces/shutdown.mojom.h"

#include "ash/shell.h"

-#include "ash/shell_delegate.h"

-#include "ash/shutdown_controller.h"

#include "ash/wm/session_state_animator.h"

#include "ash/wm/session_state_animator_impl.h"

-#include "ash/wm_shell.h"

#include "base/bind.h"

#include "base/bind_helpers.h"

#include "base/command_line.h"

« no previous file with comments | « ash/wm/lock_state_controller.h ('k') | ash/wm/lock_state_controller_unittest.cc » ('j') | no next file with comments »