ash/accelerators/accelerator_interactive_uitest_chromeos.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/accelerators/accelerator_interactive_uitest_chromeos.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/accelerators/accelerator_interactive_uitest_chromeos.cc

diff --git a/ash/accelerators/accelerator_interactive_uitest_chromeos.cc b/ash/accelerators/accelerator_interactive_uitest_chromeos.cc

index c9857dd96bd2e37ba4822f893eb02ea27fed2564..30332fc97a220959e3c84b41eb09b583f050afd7 100644

--- a/ash/accelerators/accelerator_interactive_uitest_chromeos.cc

+++ b/ash/accelerators/accelerator_interactive_uitest_chromeos.cc

@@ -4,8 +4,9 @@

#include "ash/accelerators/accelerator_controller.h"

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

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

#include "ash/shell.h"

-#include "ash/shell_observer.h"

#include "ash/system/network/network_observer.h"

#include "ash/system/tray/system_tray_delegate.h"

#include "ash/system/tray/system_tray_notifier.h"

@@ -14,7 +15,6 @@

#include "ash/wm/window_state.h"

#include "ash/wm/window_state_aura.h"

#include "ash/wm/window_util.h"

-#include "ash/wm_shell.h"

#include "base/run_loop.h"

#include "base/test/user_action_tester.cc"

#include "chromeos/network/network_handler.h"