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

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

Issue 2144783002: mash: Move MultiProfileMediaTrayItem to ash/common. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Cleanup. Created 4 years, 5 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/common/system/chromeos/media_security/multi_profile_media_tray_item.cc
diff --git a/ash/system/chromeos/media_security/multi_profile_media_tray_item.cc b/ash/common/system/chromeos/media_security/multi_profile_media_tray_item.cc
similarity index 93%
rename from ash/system/chromeos/media_security/multi_profile_media_tray_item.cc
rename to ash/common/system/chromeos/media_security/multi_profile_media_tray_item.cc
index 4164e8bf46188bb2d36c08b46eb3e68f0ae76d33..fa32b6afe66dc1a5d1bcb424cf25df9c2a3ae1ea 100644
--- a/ash/system/chromeos/media_security/multi_profile_media_tray_item.cc
+++ b/ash/common/system/chromeos/media_security/multi_profile_media_tray_item.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "ash/system/chromeos/media_security/multi_profile_media_tray_item.h"
+#include "ash/common/system/chromeos/media_security/multi_profile_media_tray_item.h"
#include "ash/common/ash_view_ids.h"
#include "ash/common/media_delegate.h"
@@ -62,7 +62,7 @@ class MultiProfileMediaTrayView : public TrayItemView,
} // namespace tray
MultiProfileMediaTrayItem::MultiProfileMediaTrayItem(SystemTray* system_tray)
- : SystemTrayItem(system_tray), tray_view_(NULL) {}
+ : SystemTrayItem(system_tray), tray_view_(nullptr) {}
MultiProfileMediaTrayItem::~MultiProfileMediaTrayItem() {}
@@ -72,7 +72,7 @@ views::View* MultiProfileMediaTrayItem::CreateTrayView(LoginStatus status) {
}
void MultiProfileMediaTrayItem::DestroyTrayView() {
- tray_view_ = NULL;
+ tray_view_ = nullptr;
}
} // namespace ash

Powered by Google App Engine
This is Rietveld 408576698