| Index: ash/common/system/tray/tray_popup_utils.cc
|
| diff --git a/ash/system/tray/tray_popup_utils.cc b/ash/common/system/tray/tray_popup_utils.cc
|
| similarity index 98%
|
| rename from ash/system/tray/tray_popup_utils.cc
|
| rename to ash/common/system/tray/tray_popup_utils.cc
|
| index 8393e04c130af97c82a4ebecc0f801bc3b34b969..4e065c68513f392ff53e0d993246dc447dbd31fe 100644
|
| --- a/ash/system/tray/tray_popup_utils.cc
|
| +++ b/ash/common/system/tray/tray_popup_utils.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/system/tray/tray_popup_utils.h"
|
| +#include "ash/common/system/tray/tray_popup_utils.h"
|
|
|
| #include <algorithm>
|
| #include <utility>
|
| @@ -10,12 +10,12 @@
|
| #include "ash/common/ash_constants.h"
|
| #include "ash/common/ash_view_ids.h"
|
| #include "ash/common/session/session_state_delegate.h"
|
| +#include "ash/common/system/tray/fixed_sized_image_view.h"
|
| +#include "ash/common/system/tray/size_range_layout.h"
|
| +#include "ash/common/system/tray/tray_constants.h"
|
| +#include "ash/common/system/tray/tray_popup_item_style.h"
|
| #include "ash/common/wm_shell.h"
|
| #include "ash/resources/vector_icons/vector_icons.h"
|
| -#include "ash/system/tray/fixed_sized_image_view.h"
|
| -#include "ash/system/tray/size_range_layout.h"
|
| -#include "ash/system/tray/tray_constants.h"
|
| -#include "ash/system/tray/tray_popup_item_style.h"
|
| #include "base/memory/ptr_util.h"
|
| #include "ui/base/l10n/l10n_util.h"
|
| #include "ui/gfx/paint_vector_icon.h"
|
|
|