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

Side by Side Diff: chrome/browser/media/router/discovery/dial/dial_media_sink_service_proxy.cc

Issue 2965843002: [Media Router] Support dual discovery (Closed)
Patch Set: resolve code review comments from Derek Created 3 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 unified diff | Download patch
OLDNEW
1 // Copyright 2017 The Chromium Authors. All rights reserved. 1 // Copyright 2017 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 "chrome/browser/media/router/discovery/dial/dial_media_sink_service_pro xy.h" 5 #include "chrome/browser/media/router/discovery/dial/dial_media_sink_service_pro xy.h"
6 6
7 #include "chrome/browser/media/router/discovery/dial/dial_media_sink_service_imp l.h" 7 #include "chrome/browser/media/router/discovery/dial/dial_media_sink_service_imp l.h"
8 #include "chrome/browser/media/router/discovery/mdns/cast_media_sink_service.h"
8 #include "content/public/browser/browser_context.h" 9 #include "content/public/browser/browser_context.h"
9 10
10 using content::BrowserThread; 11 using content::BrowserThread;
11 12
12 namespace media_router { 13 namespace media_router {
13 14
14 DialMediaSinkServiceProxy::DialMediaSinkServiceProxy( 15 DialMediaSinkServiceProxy::DialMediaSinkServiceProxy(
15 const MediaSinkService::OnSinksDiscoveredCallback& callback, 16 const MediaSinkService::OnSinksDiscoveredCallback& callback,
17 scoped_refptr<CastMediaSinkService> cast_media_sink_service,
16 content::BrowserContext* context) 18 content::BrowserContext* context)
17 : MediaSinkService(callback) { 19 : MediaSinkService(callback),
20 cast_media_sink_service_(cast_media_sink_service) {
18 DCHECK_CURRENTLY_ON(BrowserThread::UI); 21 DCHECK_CURRENTLY_ON(BrowserThread::UI);
19 auto* profile = Profile::FromBrowserContext(context); 22 auto* profile = Profile::FromBrowserContext(context);
20 request_context_ = profile->GetRequestContext(); 23 request_context_ = profile->GetRequestContext();
21 DCHECK(request_context_); 24 DCHECK(request_context_);
22 } 25 }
23 26
24 DialMediaSinkServiceProxy::~DialMediaSinkServiceProxy() = default; 27 DialMediaSinkServiceProxy::~DialMediaSinkServiceProxy() = default;
25 28
26 void DialMediaSinkServiceProxy::Start() { 29 void DialMediaSinkServiceProxy::Start() {
27 DCHECK_CURRENTLY_ON(BrowserThread::UI); 30 DCHECK_CURRENTLY_ON(BrowserThread::UI);
28 31
29 content::BrowserThread::PostTask( 32 content::BrowserThread::PostTask(
30 content::BrowserThread::IO, FROM_HERE, 33 content::BrowserThread::IO, FROM_HERE,
31 base::Bind(&DialMediaSinkServiceProxy::StartOnIOThread, this)); 34 base::Bind(&DialMediaSinkServiceProxy::StartOnIOThread, this));
32 } 35 }
33 36
34 void DialMediaSinkServiceProxy::Stop() { 37 void DialMediaSinkServiceProxy::Stop() {
35 DCHECK_CURRENTLY_ON(BrowserThread::UI); 38 DCHECK_CURRENTLY_ON(BrowserThread::UI);
36 39
37 content::BrowserThread::PostTask( 40 content::BrowserThread::PostTask(
38 content::BrowserThread::IO, FROM_HERE, 41 content::BrowserThread::IO, FROM_HERE,
39 base::Bind(&DialMediaSinkServiceProxy::StopOnIOThread, this)); 42 base::Bind(&DialMediaSinkServiceProxy::StopOnIOThread, this));
43
44 cast_media_sink_service_ = nullptr;
40 } 45 }
41 46
42 void DialMediaSinkServiceProxy::SetDialMediaSinkServiceForTest( 47 void DialMediaSinkServiceProxy::SetDialMediaSinkServiceForTest(
43 std::unique_ptr<DialMediaSinkServiceImpl> dial_media_sink_service) { 48 std::unique_ptr<DialMediaSinkServiceImpl> dial_media_sink_service) {
44 DCHECK(dial_media_sink_service); 49 DCHECK(dial_media_sink_service);
45 DCHECK(!dial_media_sink_service_); 50 DCHECK(!dial_media_sink_service_);
46 dial_media_sink_service_ = std::move(dial_media_sink_service); 51 dial_media_sink_service_ = std::move(dial_media_sink_service);
47 } 52 }
48 53
49 void DialMediaSinkServiceProxy::StartOnIOThread() { 54 void DialMediaSinkServiceProxy::StartOnIOThread() {
50 if (!dial_media_sink_service_) { 55 if (!dial_media_sink_service_) {
51 // Need to explicitly delete |dial_media_sink_service_| outside dtor to 56 // Need to explicitly delete |dial_media_sink_service_| outside dtor to
52 // avoid circular dependency. 57 // avoid circular dependency.
53 dial_media_sink_service_ = base::MakeUnique<DialMediaSinkServiceImpl>( 58 dial_media_sink_service_ = base::MakeUnique<DialMediaSinkServiceImpl>(
54 base::Bind(&DialMediaSinkServiceProxy::OnSinksDiscoveredOnIOThread, 59 base::Bind(&DialMediaSinkServiceProxy::OnSinksDiscoveredOnIOThread,
55 this), 60 this),
56 request_context_.get()); 61 cast_media_sink_service_, request_context_.get());
57 } 62 }
58 63
59 dial_media_sink_service_->Start(); 64 dial_media_sink_service_->Start();
60 } 65 }
61 66
62 void DialMediaSinkServiceProxy::StopOnIOThread() { 67 void DialMediaSinkServiceProxy::StopOnIOThread() {
63 if (!dial_media_sink_service_) 68 if (!dial_media_sink_service_)
64 return; 69 return;
65 70
66 dial_media_sink_service_->Stop(); 71 dial_media_sink_service_->Stop();
67 dial_media_sink_service_.reset(); 72 dial_media_sink_service_.reset();
68 } 73 }
69 74
70 void DialMediaSinkServiceProxy::OnSinksDiscoveredOnIOThread( 75 void DialMediaSinkServiceProxy::OnSinksDiscoveredOnIOThread(
71 std::vector<MediaSinkInternal> sinks) { 76 std::vector<MediaSinkInternal> sinks) {
72 DCHECK_CURRENTLY_ON(BrowserThread::IO); 77 DCHECK_CURRENTLY_ON(BrowserThread::IO);
73 content::BrowserThread::PostTask( 78 content::BrowserThread::PostTask(
74 content::BrowserThread::UI, FROM_HERE, 79 content::BrowserThread::UI, FROM_HERE,
75 base::Bind(sink_discovery_callback_, std::move(sinks))); 80 base::Bind(sink_discovery_callback_, std::move(sinks)));
76 } 81 }
77 82
78 } // namespace media_router 83 } // namespace media_router
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698