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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ash/system/media_security/multi_profile_media_tray_item.cc

Issue 2734733002: Revert "chromeos: Move files in //ash/common to //ash, part 3" (Closed)
Patch Set: Created 3 years, 9 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/locale/locale_notification_controller.cc ('k') | ash/system/media_security/multi_profile_media_tray_item_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/system/media_security/multi_profile_media_tray_item.cc
diff --git a/ash/system/media_security/multi_profile_media_tray_item.cc b/ash/system/media_security/multi_profile_media_tray_item.cc
index 8a7ad9614e9e2e0e0fbcd45ad931d655eba4663d..be37005adb31631548715dd29a84bec16506e7ca 100644
--- a/ash/system/media_security/multi_profile_media_tray_item.cc
+++ b/ash/system/media_security/multi_profile_media_tray_item.cc
@@ -4,15 +4,15 @@
#include "ash/system/media_security/multi_profile_media_tray_item.h"
-#include "ash/ash_view_ids.h"
-#include "ash/media_controller.h"
+#include "ash/common/ash_view_ids.h"
+#include "ash/common/media_controller.h"
+#include "ash/common/session/session_state_delegate.h"
+#include "ash/common/wm_shell.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/system/tray/system_tray_notifier.h"
#include "ash/system/tray/tray_constants.h"
#include "ash/system/tray/tray_item_view.h"
-#include "ash/wm_shell.h"
#include "ui/base/resource/resource_bundle.h"
#include "ui/gfx/paint_vector_icon.h"
#include "ui/views/controls/image_view.h"
« no previous file with comments | « ash/system/locale/locale_notification_controller.cc ('k') | ash/system/media_security/multi_profile_media_tray_item_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698