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

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: resovle code review comments from Derek and Mark Created 3 years, 4 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,
16 content::BrowserContext* context) 17 content::BrowserContext* context)
17 : MediaSinkService(callback) { 18 : MediaSinkService(callback) {
(...skipping 14 matching lines...) Expand all
32 } 33 }
33 34
34 void DialMediaSinkServiceProxy::Stop() { 35 void DialMediaSinkServiceProxy::Stop() {
35 DCHECK_CURRENTLY_ON(BrowserThread::UI); 36 DCHECK_CURRENTLY_ON(BrowserThread::UI);
36 37
37 content::BrowserThread::PostTask( 38 content::BrowserThread::PostTask(
38 content::BrowserThread::IO, FROM_HERE, 39 content::BrowserThread::IO, FROM_HERE,
39 base::Bind(&DialMediaSinkServiceProxy::StopOnIOThread, this)); 40 base::Bind(&DialMediaSinkServiceProxy::StopOnIOThread, this));
40 } 41 }
41 42
43 void DialMediaSinkServiceProxy::SetDialMediaSinkServiceDelegate(
44 scoped_refptr<DialMediaSinkServiceDelegate> delegate) {
45 DCHECK_CURRENTLY_ON(BrowserThread::UI);
46 delegate_ = delegate;
47 }
48
42 void DialMediaSinkServiceProxy::SetDialMediaSinkServiceForTest( 49 void DialMediaSinkServiceProxy::SetDialMediaSinkServiceForTest(
43 std::unique_ptr<DialMediaSinkServiceImpl> dial_media_sink_service) { 50 std::unique_ptr<DialMediaSinkServiceImpl> dial_media_sink_service) {
44 DCHECK(dial_media_sink_service); 51 DCHECK(dial_media_sink_service);
45 DCHECK(!dial_media_sink_service_); 52 DCHECK(!dial_media_sink_service_);
46 dial_media_sink_service_ = std::move(dial_media_sink_service); 53 dial_media_sink_service_ = std::move(dial_media_sink_service);
47 } 54 }
48 55
49 void DialMediaSinkServiceProxy::StartOnIOThread() { 56 void DialMediaSinkServiceProxy::StartOnIOThread() {
50 if (!dial_media_sink_service_) { 57 if (!dial_media_sink_service_) {
51 // Need to explicitly delete |dial_media_sink_service_| outside dtor to 58 // Need to explicitly delete |dial_media_sink_service_| outside dtor to
52 // avoid circular dependency. 59 // avoid circular dependency.
53 dial_media_sink_service_ = base::MakeUnique<DialMediaSinkServiceImpl>( 60 dial_media_sink_service_ = base::MakeUnique<DialMediaSinkServiceImpl>(
54 base::Bind(&DialMediaSinkServiceProxy::OnSinksDiscoveredOnIOThread, 61 base::Bind(&DialMediaSinkServiceProxy::OnSinksDiscoveredOnIOThread,
55 this), 62 this),
56 request_context_.get()); 63 request_context_.get());
64 dial_media_sink_service_->SetDialMediaSinkServiceDelegate(delegate_);
57 } 65 }
58 66
59 dial_media_sink_service_->Start(); 67 dial_media_sink_service_->Start();
60 } 68 }
61 69
62 void DialMediaSinkServiceProxy::StopOnIOThread() { 70 void DialMediaSinkServiceProxy::StopOnIOThread() {
63 if (!dial_media_sink_service_) 71 if (!dial_media_sink_service_)
64 return; 72 return;
65 73
66 dial_media_sink_service_->Stop(); 74 dial_media_sink_service_->Stop();
67 dial_media_sink_service_.reset(); 75 dial_media_sink_service_.reset();
68 } 76 }
69 77
70 void DialMediaSinkServiceProxy::OnSinksDiscoveredOnIOThread( 78 void DialMediaSinkServiceProxy::OnSinksDiscoveredOnIOThread(
71 std::vector<MediaSinkInternal> sinks) { 79 std::vector<MediaSinkInternal> sinks) {
72 DCHECK_CURRENTLY_ON(BrowserThread::IO); 80 DCHECK_CURRENTLY_ON(BrowserThread::IO);
73 content::BrowserThread::PostTask( 81 content::BrowserThread::PostTask(
74 content::BrowserThread::UI, FROM_HERE, 82 content::BrowserThread::UI, FROM_HERE,
75 base::Bind(sink_discovery_callback_, std::move(sinks))); 83 base::Bind(sink_discovery_callback_, std::move(sinks)));
76 } 84 }
77 85
78 } // namespace media_router 86 } // namespace media_router
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698