ash/mus/shell_delegate_mus.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/mus/shell_delegate_mus.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/mus/shell_delegate_mus.cc

diff --git a/ash/mus/shell_delegate_mus.cc b/ash/mus/shell_delegate_mus.cc

index 4354f8c3b2408caca352dccffe7351c76523c574..2f17564444f62a53bfb5ae558b43ffb71ef4a932 100644

--- a/ash/mus/shell_delegate_mus.cc

+++ b/ash/mus/shell_delegate_mus.cc

@@ -6,15 +6,15 @@

#include <utility>

-#include "ash/gpu_support_stub.h"

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

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

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

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

#include "ash/mus/accessibility_delegate_mus.h"

#include "ash/mus/context_menu_mus.h"

#include "ash/mus/shelf_delegate_mus.h"

#include "ash/mus/system_tray_delegate_mus.h"

#include "ash/mus/wallpaper_delegate_mus.h"

-#include "ash/palette_delegate.h"

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

-#include "ash/wm_shell.h"

#include "base/memory/ptr_util.h"

#include "base/strings/string16.h"

#include "base/strings/string_util.h"

« no previous file with comments | « ash/mus/shell_delegate_mus.h ('k') | ash/mus/test/ash_test_impl_mus.cc » ('j') | no next file with comments »