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

Unified Diff: ash/test/tray_cast_test_api.cc

Issue 1567103005: Replace base::CallbackList with base::ObserverList in CastConfigDelegate (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@lkgr
Patch Set: Add DLL export to fix windows build Created 4 years, 11 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/test/tray_cast_test_api.cc
diff --git a/ash/test/tray_cast_test_api.cc b/ash/test/tray_cast_test_api.cc
index 5d0bcf8aab277930581d87407e18bcec6a98b317..a1a2b61850fd3edfe0b4e2e1c8cc85c34ce6a912 100644
--- a/ash/test/tray_cast_test_api.cc
+++ b/ash/test/tray_cast_test_api.cc
@@ -4,7 +4,10 @@
#include "ash/test/tray_cast_test_api.h"
+#include "ash/cast_config_delegate.h"
+#include "ash/shell.h"
#include "ash/system/tray/system_tray.h"
+#include "ash/system/tray/system_tray_delegate.h"
#include "ui/views/view.h"
namespace ash {
@@ -46,7 +49,11 @@ void TrayCastTestAPI::OnCastingSessionStartedOrStopped(bool is_casting) {
}
void TrayCastTestAPI::ReleaseConfigCallbacks() {
- tray_cast_->device_update_subscription_.reset();
+ tray_cast_->added_observer_ = false;
+ ash::Shell::GetInstance()
achuithb 2016/01/13 09:21:25 Do we not need to do the checks for GetInstance an
jdufault 2016/01/13 19:43:26 Done, though I'm not sure we need them. This is te
+ ->system_tray_delegate()
+ ->GetCastConfigDelegate()
+ ->RemoveObserver(tray_cast_);
}
bool TrayCastTestAPI::IsViewDrawn(TrayCast::ChildViewId id) const {

Powered by Google App Engine
This is Rietveld 408576698