Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(220)

Unified Diff: ash/system/audio/tray_audio.cc

Issue 2732813002: chromeos: Move files in //ash/common to //ash, part 1 (Closed)
Patch Set: rebase Created 3 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/system/audio/tray_audio.h ('k') | ash/system/audio/tray_audio_delegate.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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"
« no previous file with comments | « ash/system/audio/tray_audio.h ('k') | ash/system/audio/tray_audio_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698