ash/shell.cc - Issue 2731873002: Revert "chromeos: Move files in //ash/common to //ash, part 1"

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.cc

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

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

index 68498865297366174599a5db7070e23688405908..90c62c0b85af397d0abb5a33da500ac9527fdbff 100644

--- a/ash/shell.cc

+++ b/ash/shell.cc

@@ -28,6 +28,11 @@

#include "ash/common/shelf/shelf_model.h"

#include "ash/common/shelf/wm_shelf.h"

#include "ash/common/shell_delegate.h"

+#include "ash/common/system/chromeos/bluetooth/bluetooth_notification_controller.h"

+#include "ash/common/system/chromeos/network/sms_observer.h"

+#include "ash/common/system/chromeos/power/power_status.h"

+#include "ash/common/system/status_area_widget.h"

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

#include "ash/common/wallpaper/wallpaper_delegate.h"

#include "ash/common/wm/container_finder.h"

#include "ash/common/wm/maximize_mode/maximize_mode_controller.h"

@@ -63,14 +68,9 @@

#include "ash/root_window_controller.h"

#include "ash/shell_init_params.h"

#include "ash/sticky_keys/sticky_keys_controller.h"

-#include "ash/system/bluetooth/bluetooth_notification_controller.h"

-#include "ash/system/network/sms_observer.h"

-#include "ash/system/power/power_event_observer.h"

-#include "ash/system/power/power_status.h"

-#include "ash/system/power/video_activity_notifier.h"

-#include "ash/system/screen_layout_observer.h"

-#include "ash/system/status_area_widget.h"

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

+#include "ash/system/chromeos/power/power_event_observer.h"

+#include "ash/system/chromeos/power/video_activity_notifier.h"

+#include "ash/system/chromeos/screen_layout_observer.h"

#include "ash/touch/ash_touch_transform_controller.h"

#include "ash/utility/screenshot_controller.h"

#include "ash/virtual_keyboard_controller.h"

« no previous file with comments | « ash/shelf/shelf_widget_unittest.cc ('k') | ash/shell/shell_delegate_impl.cc » ('j') | no next file with comments »