| Index: ash/shelf/shelf_widget.cc
|
| diff --git a/ash/common/shelf/shelf_widget.cc b/ash/shelf/shelf_widget.cc
|
| similarity index 95%
|
| rename from ash/common/shelf/shelf_widget.cc
|
| rename to ash/shelf/shelf_widget.cc
|
| index 0bbfb54a509dccfa82daa27511d513f80e383e18..b14169cfd2ae1ed616d9de8eab4408f9f2244f0c 100644
|
| --- a/ash/common/shelf/shelf_widget.cc
|
| +++ b/ash/shelf/shelf_widget.cc
|
| @@ -2,25 +2,25 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#include "ash/common/shelf/shelf_widget.h"
|
| +#include "ash/shelf/shelf_widget.h"
|
|
|
| #include "ash/animation/animation_change_type.h"
|
| -#include "ash/common/focus_cycler.h"
|
| -#include "ash/common/session/session_state_delegate.h"
|
| -#include "ash/common/shelf/app_list_button.h"
|
| -#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_shelf.h"
|
| -#include "ash/common/shelf/wm_shelf_util.h"
|
| -#include "ash/common/wm_shell.h"
|
| -#include "ash/common/wm_window.h"
|
| +#include "ash/focus_cycler.h"
|
| #include "ash/root_window_controller.h"
|
| +#include "ash/session/session_state_delegate.h"
|
| +#include "ash/shelf/app_list_button.h"
|
| +#include "ash/shelf/shelf_background_animator_observer.h"
|
| +#include "ash/shelf/shelf_constants.h"
|
| +#include "ash/shelf/shelf_delegate.h"
|
| +#include "ash/shelf/shelf_layout_manager.h"
|
| +#include "ash/shelf/shelf_view.h"
|
| +#include "ash/shelf/wm_shelf.h"
|
| +#include "ash/shelf/wm_shelf_util.h"
|
| #include "ash/system/status_area_layout_manager.h"
|
| #include "ash/system/status_area_widget.h"
|
| #include "ash/wm/window_properties.h"
|
| +#include "ash/wm_shell.h"
|
| +#include "ash/wm_window.h"
|
| #include "base/memory/ptr_util.h"
|
| #include "ui/compositor/layer.h"
|
| #include "ui/compositor/scoped_layer_animation_settings.h"
|
|
|