| Index: ash/system/audio/tray_audio.cc
|
| diff --git a/ash/common/system/chromeos/audio/tray_audio.cc b/ash/system/audio/tray_audio.cc
|
| similarity index 94%
|
| rename from ash/common/system/chromeos/audio/tray_audio.cc
|
| rename to ash/system/audio/tray_audio.cc
|
| index 11fa71e77d35f4db152fc7d9bfd8972eaf76444e..ac4a3fb6a3d915d95aa290c12af7d3e6f50b0b32 100644
|
| --- a/ash/common/system/chromeos/audio/tray_audio.cc
|
| +++ b/ash/system/audio/tray_audio.cc
|
| @@ -2,16 +2,16 @@
|
| // 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/audio/tray_audio.h"
|
| +#include "ash/system/audio/tray_audio.h"
|
|
|
| -#include "ash/common/system/chromeos/audio/audio_detailed_view.h"
|
| -#include "ash/common/system/chromeos/audio/tray_audio_delegate_chromeos.h"
|
| -#include "ash/common/system/chromeos/audio/volume_view.h"
|
| -#include "ash/common/system/tray/system_tray.h"
|
| -#include "ash/common/system/tray/tray_constants.h"
|
| #include "ash/common/wm_shell.h"
|
| #include "ash/common/wm_window.h"
|
| #include "ash/root_window_controller.h"
|
| +#include "ash/system/audio/audio_detailed_view.h"
|
| +#include "ash/system/audio/tray_audio_delegate_chromeos.h"
|
| +#include "ash/system/audio/volume_view.h"
|
| +#include "ash/system/tray/system_tray.h"
|
| +#include "ash/system/tray/tray_constants.h"
|
| #include "chromeos/dbus/dbus_thread_manager.h"
|
| #include "ui/display/display.h"
|
| #include "ui/display/manager/managed_display_info.h"
|
|
|