| Index: ash/system/palette/palette_utils.cc
|
| diff --git a/ash/system/palette/palette_utils.cc b/ash/system/palette/palette_utils.cc
|
| index 86b9248593a9f7a2ec5d12c9406eebe72d69b9d0..20320fa1915b37ec0d484b57c358210b9e4cf3a0 100644
|
| --- a/ash/system/palette/palette_utils.cc
|
| +++ b/ash/system/palette/palette_utils.cc
|
| @@ -4,12 +4,12 @@
|
|
|
| #include "ash/system/palette/palette_utils.h"
|
|
|
| -#include "ash/ash_switches.h"
|
| +#include "ash/common/ash_switches.h"
|
| +#include "ash/common/wm_shell.h"
|
| +#include "ash/common/wm_window.h"
|
| #include "ash/shelf/wm_shelf.h"
|
| #include "ash/system/palette/palette_tray.h"
|
| #include "ash/system/status_area_widget.h"
|
| -#include "ash/wm_shell.h"
|
| -#include "ash/wm_window.h"
|
| #include "base/command_line.h"
|
| #include "ui/events/devices/input_device_manager.h"
|
| #include "ui/events/devices/touchscreen_device.h"
|
|
|