| Index: ash/common/shelf/shelf_widget.cc
|
| diff --git a/ash/shelf/shelf_widget.cc b/ash/common/shelf/shelf_widget.cc
|
| similarity index 99%
|
| rename from ash/shelf/shelf_widget.cc
|
| rename to ash/common/shelf/shelf_widget.cc
|
| index 5cda976831979434aeda2635ab3bdf0c79769167..aa6afdd45939fa225f6f854e8d05f7fb7f96b240 100644
|
| --- a/ash/shelf/shelf_widget.cc
|
| +++ b/ash/common/shelf/shelf_widget.cc
|
| @@ -2,7 +2,7 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#include "ash/shelf/shelf_widget.h"
|
| +#include "ash/common/shelf/shelf_widget.h"
|
|
|
| #include "ash/common/focus_cycler.h"
|
| #include "ash/common/material_design/material_design_controller.h"
|
| @@ -10,17 +10,17 @@
|
| #include "ash/common/shelf/shelf_background_animator_observer.h"
|
| #include "ash/common/shelf/shelf_constants.h"
|
| #include "ash/common/shelf/shelf_delegate.h"
|
| +#include "ash/common/shelf/shelf_layout_manager.h"
|
| #include "ash/common/shelf/shelf_view.h"
|
| #include "ash/common/shelf/wm_dimmer_view.h"
|
| #include "ash/common/shelf/wm_shelf.h"
|
| #include "ash/common/shelf/wm_shelf_util.h"
|
| +#include "ash/common/system/status_area_layout_manager.h"
|
| #include "ash/common/system/status_area_widget.h"
|
| #include "ash/common/system/tray/system_tray_delegate.h"
|
| #include "ash/common/wm_root_window_controller.h"
|
| #include "ash/common/wm_shell.h"
|
| #include "ash/common/wm_window.h"
|
| -#include "ash/shelf/shelf_layout_manager.h"
|
| -#include "ash/wm/status_area_layout_manager.h"
|
| #include "base/memory/ptr_util.h"
|
| #include "grit/ash_resources.h"
|
| #include "ui/base/resource/resource_bundle.h"
|
|
|