ash/common/wm_shell.cc - Issue 2732813002: 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/common/wm_shell.cc

Issue 2732813002: chromeos: Move files in //ash/common to //ash, part 1 (Closed)

Patch Set: rebase 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:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « ash/common/wm/overview/window_selector_controller.cc ('k') | ash/content/display/screen_orientation_controller_chromeos_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: ash/common/wm_shell.cc

diff --git a/ash/common/wm_shell.cc b/ash/common/wm_shell.cc

index fcd7804aad242e9f61489c6f20e761ce8871bae5..d89bd7ba47e991f3aa4d2a01f6a4518a550aeab7 100644

--- a/ash/common/wm_shell.cc

+++ b/ash/common/wm_shell.cc

@@ -26,17 +26,6 @@

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

#include "ash/common/shell_delegate.h"

#include "ash/common/shutdown_controller.h"

-#include "ash/common/system/brightness_control_delegate.h"

-#include "ash/common/system/chromeos/brightness/brightness_controller_chromeos.h"

-#include "ash/common/system/chromeos/keyboard_brightness_controller.h"

-#include "ash/common/system/chromeos/network/vpn_list.h"

-#include "ash/common/system/chromeos/session/logout_confirmation_controller.h"

-#include "ash/common/system/keyboard_brightness_control_delegate.h"

-#include "ash/common/system/locale/locale_notification_controller.h"

-#include "ash/common/system/toast/toast_manager.h"

-#include "ash/common/system/tray/system_tray_controller.h"

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

-#include "ash/common/system/tray/system_tray_notifier.h"

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

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

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

@@ -51,6 +40,17 @@

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

#include "ash/root_window_controller.h"

#include "ash/shell.h"

+#include "ash/system/brightness/brightness_controller_chromeos.h"

+#include "ash/system/brightness_control_delegate.h"

+#include "ash/system/keyboard_brightness_control_delegate.h"

+#include "ash/system/keyboard_brightness_controller.h"

+#include "ash/system/locale/locale_notification_controller.h"

+#include "ash/system/network/vpn_list.h"

+#include "ash/system/session/logout_confirmation_controller.h"

+#include "ash/system/toast/toast_manager.h"

+#include "ash/system/tray/system_tray_controller.h"

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

+#include "ash/system/tray/system_tray_notifier.h"

#include "base/bind.h"

#include "base/logging.h"

#include "base/memory/ptr_util.h"