| Index: ash/system/cast/tray_cast.cc
|
| diff --git a/ash/common/system/chromeos/cast/tray_cast.cc b/ash/system/cast/tray_cast.cc
|
| similarity index 95%
|
| rename from ash/common/system/chromeos/cast/tray_cast.cc
|
| rename to ash/system/cast/tray_cast.cc
|
| index 4ad2fd9fa44864f672eb98f0d7b6841bad0abd76..a016dcb0b4660ec32f539ca3aa7e8a42c16ab2fe 100644
|
| --- a/ash/common/system/chromeos/cast/tray_cast.cc
|
| +++ b/ash/system/cast/tray_cast.cc
|
| @@ -2,34 +2,34 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#include "ash/common/system/chromeos/cast/tray_cast.h"
|
| +#include "ash/system/cast/tray_cast.h"
|
|
|
| #include <map>
|
| #include <string>
|
| #include <utility>
|
| #include <vector>
|
|
|
| -#include "ash/common/cast_config_controller.h"
|
| -#include "ash/common/material_design/material_design_controller.h"
|
| -#include "ash/common/session/session_state_delegate.h"
|
| -#include "ash/common/shelf/wm_shelf_util.h"
|
| -#include "ash/common/system/chromeos/screen_security/screen_tray_item.h"
|
| -#include "ash/common/system/tray/fixed_sized_image_view.h"
|
| -#include "ash/common/system/tray/hover_highlight_view.h"
|
| -#include "ash/common/system/tray/system_tray.h"
|
| -#include "ash/common/system/tray/system_tray_delegate.h"
|
| -#include "ash/common/system/tray/throbber_view.h"
|
| -#include "ash/common/system/tray/tray_constants.h"
|
| -#include "ash/common/system/tray/tray_details_view.h"
|
| -#include "ash/common/system/tray/tray_item_more.h"
|
| -#include "ash/common/system/tray/tray_item_view.h"
|
| -#include "ash/common/system/tray/tray_utils.h"
|
| -#include "ash/common/wm_shell.h"
|
| +#include "ash/cast_config_controller.h"
|
| +#include "ash/material_design/material_design_controller.h"
|
| #include "ash/public/cpp/shelf_types.h"
|
| #include "ash/public/interfaces/cast_config.mojom.h"
|
| #include "ash/resources/grit/ash_resources.h"
|
| #include "ash/resources/vector_icons/vector_icons.h"
|
| +#include "ash/session/session_state_delegate.h"
|
| +#include "ash/shelf/wm_shelf_util.h"
|
| #include "ash/strings/grit/ash_strings.h"
|
| +#include "ash/system/screen_security/screen_tray_item.h"
|
| +#include "ash/system/tray/fixed_sized_image_view.h"
|
| +#include "ash/system/tray/hover_highlight_view.h"
|
| +#include "ash/system/tray/system_tray.h"
|
| +#include "ash/system/tray/system_tray_delegate.h"
|
| +#include "ash/system/tray/throbber_view.h"
|
| +#include "ash/system/tray/tray_constants.h"
|
| +#include "ash/system/tray/tray_details_view.h"
|
| +#include "ash/system/tray/tray_item_more.h"
|
| +#include "ash/system/tray/tray_item_view.h"
|
| +#include "ash/system/tray/tray_utils.h"
|
| +#include "ash/wm_shell.h"
|
| #include "base/bind.h"
|
| #include "base/strings/utf_string_conversions.h"
|
| #include "ui/base/l10n/l10n_util.h"
|
|
|