| Index: ash/shelf/wm_shelf.cc
|
| diff --git a/ash/common/shelf/wm_shelf.cc b/ash/shelf/wm_shelf.cc
|
| similarity index 95%
|
| rename from ash/common/shelf/wm_shelf.cc
|
| rename to ash/shelf/wm_shelf.cc
|
| index 456af7719939dd01c8ca0c8bb7ddbee8a0676258..282325333d956cb0e4f99b5cd20cd136012b5909 100644
|
| --- a/ash/common/shelf/wm_shelf.cc
|
| +++ b/ash/shelf/wm_shelf.cc
|
| @@ -2,23 +2,23 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#include "ash/common/shelf/wm_shelf.h"
|
| -
|
| -#include "ash/common/shelf/shelf_controller.h"
|
| -#include "ash/common/shelf/shelf_delegate.h"
|
| -#include "ash/common/shelf/shelf_item_delegate.h"
|
| -#include "ash/common/shelf/shelf_layout_manager.h"
|
| -#include "ash/common/shelf/shelf_locking_manager.h"
|
| -#include "ash/common/shelf/shelf_model.h"
|
| -#include "ash/common/shelf/shelf_widget.h"
|
| -#include "ash/common/shelf/wm_shelf_observer.h"
|
| -#include "ash/common/wm_shell.h"
|
| -#include "ash/common/wm_window.h"
|
| +#include "ash/shelf/wm_shelf.h"
|
| +
|
| #include "ash/public/cpp/shell_window_ids.h"
|
| #include "ash/root_window_controller.h"
|
| #include "ash/shelf/shelf_bezel_event_handler.h"
|
| +#include "ash/shelf/shelf_controller.h"
|
| +#include "ash/shelf/shelf_delegate.h"
|
| +#include "ash/shelf/shelf_item_delegate.h"
|
| +#include "ash/shelf/shelf_layout_manager.h"
|
| +#include "ash/shelf/shelf_locking_manager.h"
|
| +#include "ash/shelf/shelf_model.h"
|
| +#include "ash/shelf/shelf_widget.h"
|
| +#include "ash/shelf/wm_shelf_observer.h"
|
| #include "ash/shell.h"
|
| #include "ash/system/tray/system_tray_delegate.h"
|
| +#include "ash/wm_shell.h"
|
| +#include "ash/wm_window.h"
|
| #include "base/logging.h"
|
| #include "base/memory/ptr_util.h"
|
| #include "ui/aura/env.h"
|
|
|