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

Unified Diff: ui/arc/notification/arc_notification_surface_manager.cc

Issue 2935893004: Add unittest for ArcNotificationContentView (Closed)
Patch Set: . Created 3 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: ui/arc/notification/arc_notification_surface_manager.cc
diff --git a/ui/arc/notification/arc_notification_surface_manager.cc b/ui/arc/notification/arc_notification_surface_manager.cc
index 719c7dc35076f14a7e5f702d7de51d80c821ba58..314619456ca839dcf5559b9d5e9f3ea8a6b5a58a 100644
--- a/ui/arc/notification/arc_notification_surface_manager.cc
+++ b/ui/arc/notification/arc_notification_surface_manager.cc
@@ -4,70 +4,27 @@
#include "ui/arc/notification/arc_notification_surface_manager.h"
-#include <algorithm>
-
-#include "components/exo/notification_surface.h"
+#include "base/logging.h"
namespace arc {
-namespace {
-
-ArcNotificationSurfaceManager* instance = nullptr;
-
-} // namespace
+// static
+ArcNotificationSurfaceManager* ArcNotificationSurfaceManager::instance_ =
+ nullptr;
ArcNotificationSurfaceManager::ArcNotificationSurfaceManager() {
- DCHECK(!instance);
- instance = this;
+ DCHECK(!instance_);
+ instance_ = this;
}
ArcNotificationSurfaceManager::~ArcNotificationSurfaceManager() {
- DCHECK_EQ(this, instance);
- instance = nullptr;
+ DCHECK_EQ(this, instance_);
+ instance_ = nullptr;
}
// static
ArcNotificationSurfaceManager* ArcNotificationSurfaceManager::Get() {
- return instance;
-}
-
-exo::NotificationSurface* ArcNotificationSurfaceManager::GetSurface(
- const std::string& notification_key) const {
- auto it = notification_surface_map_.find(notification_key);
- return it == notification_surface_map_.end() ? nullptr : it->second;
-}
-
-void ArcNotificationSurfaceManager::AddSurface(
- exo::NotificationSurface* surface) {
- if (notification_surface_map_.find(surface->notification_key()) !=
- notification_surface_map_.end()) {
- NOTREACHED();
- return;
- }
-
- notification_surface_map_[surface->notification_key()] = surface;
-
- for (auto& observer : observers_)
- observer.OnNotificationSurfaceAdded(surface);
-}
-
-void ArcNotificationSurfaceManager::RemoveSurface(
- exo::NotificationSurface* surface) {
- auto it = notification_surface_map_.find(surface->notification_key());
- if (it == notification_surface_map_.end())
- return;
-
- notification_surface_map_.erase(it);
- for (auto& observer : observers_)
- observer.OnNotificationSurfaceRemoved(surface);
-}
-
-void ArcNotificationSurfaceManager::AddObserver(Observer* observer) {
- observers_.AddObserver(observer);
-}
-
-void ArcNotificationSurfaceManager::RemoveObserver(Observer* observer) {
- observers_.RemoveObserver(observer);
+ return instance_;
}
} // namespace arc
« no previous file with comments | « ui/arc/notification/arc_notification_surface_manager.h ('k') | ui/arc/notification/arc_notification_surface_manager_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698