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

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

Issue 2063813002: mash: Move SystemTrayImage and TrayImageItem to //ash/common (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@wmnotifier
Patch Set: rebase Created 4 years, 6 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
Index: ash/system/tray/media_security/multi_profile_media_tray_item.cc
diff --git a/ash/system/tray/media_security/multi_profile_media_tray_item.cc b/ash/system/tray/media_security/multi_profile_media_tray_item.cc
index 5c43c298e04509f579dc9dd90fa1d558382427e6..48f8858cf4eaaa5d2e8f77678fc3ab6a757b8be5 100644
--- a/ash/system/tray/media_security/multi_profile_media_tray_item.cc
+++ b/ash/system/tray/media_security/multi_profile_media_tray_item.cc
@@ -6,11 +6,11 @@
#include "ash/ash_view_ids.h"
#include "ash/common/session/session_state_delegate.h"
+#include "ash/common/system/tray/tray_item_view.h"
#include "ash/media_delegate.h"
#include "ash/shell.h"
#include "ash/system/tray/media_security/media_capture_observer.h"
#include "ash/system/tray/system_tray_notifier.h"
-#include "ash/system/tray/tray_item_view.h"
#include "grit/ash_resources.h"
#include "ui/base/resource/resource_bundle.h"
#include "ui/views/controls/image_view.h"

Powered by Google App Engine
This is Rietveld 408576698