ash/display/display_util.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/display/display_util.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/display/display_util.cc

diff --git a/ash/display/display_util.cc b/ash/display/display_util.cc

index e6a91644e0f8c7b919cf5e2151f308f592a6fdff..271802a43c27efc07c4a7a2e8c55291ae2efab12 100644

--- a/ash/display/display_util.cc

+++ b/ash/display/display_util.cc

@@ -7,16 +7,16 @@

#include <algorithm>

#include <utility>

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

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

#include "ash/display/extended_mouse_warp_controller.h"

#include "ash/display/null_mouse_warp_controller.h"

#include "ash/display/unified_mouse_warp_controller.h"

#include "ash/host/ash_window_tree_host.h"

-#include "ash/new_window_controller.h"

#include "ash/resources/vector_icons/vector_icons.h"

#include "ash/shell.h"

#include "ash/strings/grit/ash_strings.h"

#include "ash/system/system_notifier.h"

-#include "ash/wm_shell.h"

#include "base/memory/ptr_util.h"

#include "base/strings/string_number_conversions.h"

#include "base/strings/utf_string_conversions.h"

« no previous file with comments | « ash/display/display_manager_unittest.cc ('k') | ash/display/projecting_observer_chromeos.h » ('j') | no next file with comments »