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

Side by Side 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 unified diff | Download patch
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "ash/test/tray_cast_test_api.h" 5 #include "ash/test/tray_cast_test_api.h"
6 6
7 #include "ash/cast_config_delegate.h"
8 #include "ash/shell.h"
7 #include "ash/system/tray/system_tray.h" 9 #include "ash/system/tray/system_tray.h"
10 #include "ash/system/tray/system_tray_delegate.h"
8 #include "ui/views/view.h" 11 #include "ui/views/view.h"
9 12
10 namespace ash { 13 namespace ash {
11 14
12 TrayCastTestAPI::TrayCastTestAPI(TrayCast* tray_cast) : tray_cast_(tray_cast) {} 15 TrayCastTestAPI::TrayCastTestAPI(TrayCast* tray_cast) : tray_cast_(tray_cast) {}
13 16
14 TrayCastTestAPI::~TrayCastTestAPI() {} 17 TrayCastTestAPI::~TrayCastTestAPI() {}
15 18
16 bool TrayCastTestAPI::IsTrayInitialized() const { 19 bool TrayCastTestAPI::IsTrayInitialized() const {
17 return tray_cast_->default_ != nullptr; 20 return tray_cast_->default_ != nullptr;
(...skipping 21 matching lines...) Expand all
39 42
40 void TrayCastTestAPI::StopCast() { 43 void TrayCastTestAPI::StopCast() {
41 return tray_cast_->StopCastForTest(); 44 return tray_cast_->StopCastForTest();
42 } 45 }
43 46
44 void TrayCastTestAPI::OnCastingSessionStartedOrStopped(bool is_casting) { 47 void TrayCastTestAPI::OnCastingSessionStartedOrStopped(bool is_casting) {
45 tray_cast_->OnCastingSessionStartedOrStopped(is_casting); 48 tray_cast_->OnCastingSessionStartedOrStopped(is_casting);
46 } 49 }
47 50
48 void TrayCastTestAPI::ReleaseConfigCallbacks() { 51 void TrayCastTestAPI::ReleaseConfigCallbacks() {
49 tray_cast_->device_update_subscription_.reset(); 52 tray_cast_->added_observer_ = false;
53 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
54 ->system_tray_delegate()
55 ->GetCastConfigDelegate()
56 ->RemoveObserver(tray_cast_);
50 } 57 }
51 58
52 bool TrayCastTestAPI::IsViewDrawn(TrayCast::ChildViewId id) const { 59 bool TrayCastTestAPI::IsViewDrawn(TrayCast::ChildViewId id) const {
53 const views::View* view = tray_cast_->GetDefaultView()->GetViewByID(id); 60 const views::View* view = tray_cast_->GetDefaultView()->GetViewByID(id);
54 return view != nullptr && view->IsDrawn(); 61 return view != nullptr && view->IsDrawn();
55 } 62 }
56 63
57 } // namespace ash 64 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698