chrome/browser/ui/ash/ash_init.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: chrome/browser/ui/ash/ash_init.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: chrome/browser/ui/ash/ash_init.cc

diff --git a/chrome/browser/ui/ash/ash_init.cc b/chrome/browser/ui/ash/ash_init.cc

index 4f8b4de6149499455db259ffab3ba3e1f3ec6d6a..fe09e3ae2c4fb6ed8c07aa10772bb7ad5b6ab826 100644

--- a/chrome/browser/ui/ash/ash_init.cc

+++ b/chrome/browser/ui/ash/ash_init.cc

@@ -6,13 +6,13 @@

#include "ash/accelerators/accelerator_controller.h"

#include "ash/accelerators/accelerator_controller_delegate_aura.h"

-#include "ash/accessibility_types.h"

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

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

#include "ash/high_contrast/high_contrast_controller.h"

#include "ash/magnifier/magnification_controller.h"

#include "ash/magnifier/partial_magnification_controller.h"

#include "ash/shell.h"

#include "ash/shell_init_params.h"

-#include "ash/wm_shell.h"

#include "base/command_line.h"

#include "base/sys_info.h"

#include "base/threading/sequenced_worker_pool.h"