ash/shell/shell_delegate_impl.cc - Issue 2734753002: Revert "chromeos: Move files in //ash/common to //ash, part 2"

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/shell/shell_delegate_impl.cc

Issue 2734753002: Revert "chromeos: Move files in //ash/common to //ash, part 2" (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/shell/shell_delegate_impl.cc

diff --git a/ash/shell/shell_delegate_impl.cc b/ash/shell/shell_delegate_impl.cc

index 0f47f6afc0b383305611bf7c5579445a3ef1a005..45cac81daf37d47057a32912efeda77be4a3c80e 100644

--- a/ash/shell/shell_delegate_impl.cc

+++ b/ash/shell/shell_delegate_impl.cc

@@ -9,6 +9,8 @@

#include "ash/common/gpu_support_stub.h"

#include "ash/common/palette_delegate.h"

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

+#include "ash/common/test/test_shelf_delegate.h"

+#include "ash/common/wm/window_state.h"

#include "ash/default_wallpaper_delegate.h"

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

#include "ash/shell.h"

@@ -17,8 +19,6 @@

#include "ash/shell/toplevel_window.h"

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

#include "ash/test/test_keyboard_ui.h"

-#include "ash/test/test_shelf_delegate.h"

-#include "ash/wm/window_state.h"

#include "base/memory/ptr_util.h"

#include "base/message_loop/message_loop.h"

#include "base/strings/utf_string_conversions.h"

« no previous file with comments | « ash/shell/panel_window.cc ('k') | ash/shell/toplevel_window.cc » ('j') | no next file with comments »