| Index: ash/shell.cc
|
| diff --git a/ash/shell.cc b/ash/shell.cc
|
| index 63de0d8efa9537a58b2c50aeaab07ccf61b22930..3922aa79321ee26267880a896dd9bf9842ceb7ab 100644
|
| --- a/ash/shell.cc
|
| +++ b/ash/shell.cc
|
| @@ -15,8 +15,8 @@
|
| #include "ash/focus_cycler.h"
|
| #include "ash/ime/input_method_event_filter.h"
|
| #include "ash/launcher/launcher.h"
|
| -#include "ash/monitor/multi_monitor_manager.h"
|
| #include "ash/monitor/monitor_controller.h"
|
| +#include "ash/monitor/multi_monitor_manager.h"
|
| #include "ash/screen_ash.h"
|
| #include "ash/shell_delegate.h"
|
| #include "ash/shell_factory.h"
|
| @@ -30,8 +30,8 @@
|
| #include "ash/system/power/power_status_observer.h"
|
| #include "ash/system/power/tray_power.h"
|
| #include "ash/system/settings/tray_settings.h"
|
| -#include "ash/system/tray/system_tray_delegate.h"
|
| #include "ash/system/tray/system_tray.h"
|
| +#include "ash/system/tray/system_tray_delegate.h"
|
| #include "ash/system/tray/tray_empty.h"
|
| #include "ash/system/tray_accessibility.h"
|
| #include "ash/system/tray_caps_lock.h"
|
| @@ -42,8 +42,8 @@
|
| #include "ash/wm/custom_frame_view_ash.h"
|
| #include "ash/wm/dialog_frame_view.h"
|
| #include "ash/wm/event_client_impl.h"
|
| -#include "ash/wm/panel_window_event_filter.h"
|
| #include "ash/wm/panel_layout_manager.h"
|
| +#include "ash/wm/panel_window_event_filter.h"
|
| #include "ash/wm/partial_screenshot_event_filter.h"
|
| #include "ash/wm/power_button_controller.h"
|
| #include "ash/wm/resize_shadow_controller.h"
|
| @@ -60,10 +60,10 @@
|
| #include "ash/wm/window_cycle_controller.h"
|
| #include "ash/wm/window_modality_controller.h"
|
| #include "ash/wm/window_util.h"
|
| -#include "ash/wm/workspace_controller.h"
|
| #include "ash/wm/workspace/workspace_event_filter.h"
|
| #include "ash/wm/workspace/workspace_layout_manager.h"
|
| #include "ash/wm/workspace/workspace_manager.h"
|
| +#include "ash/wm/workspace_controller.h"
|
| #include "base/bind.h"
|
| #include "base/command_line.h"
|
| #include "chromeos/dbus/power_supply_status.h"
|
|
|