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

Side by Side Diff: chrome/browser/media/router/media_sinks_observer.cc

Issue 2678123003: Revert of Convert MediaRouter mojom apis to intake url::Origin objects instead of strings (Closed)
Patch Set: Created 3 years, 10 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 "chrome/browser/media/router/media_sinks_observer.h" 5 #include "chrome/browser/media/router/media_sinks_observer.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "base/stl_util.h" 8 #include "base/stl_util.h"
9 #include "chrome/browser/media/router/media_router.h" 9 #include "chrome/browser/media/router/media_router.h"
10 10
11 #if DCHECK_IS_ON() 11 #if DCHECK_IS_ON()
12 #include "base/auto_reset.h" 12 #include "base/auto_reset.h"
13 #endif 13 #endif
14 14
15 namespace media_router { 15 namespace media_router {
16 16
17 MediaSinksObserver::MediaSinksObserver(MediaRouter* router, 17 MediaSinksObserver::MediaSinksObserver(MediaRouter* router,
18 const MediaSource& source, 18 const MediaSource& source,
19 const url::Origin& origin) 19 const GURL& origin)
20 : source_(source), origin_(origin), router_(router), initialized_(false) { 20 : source_(source), origin_(origin), router_(router), initialized_(false) {
21 DCHECK(router_); 21 DCHECK(router_);
22 } 22 }
23 23
24 MediaSinksObserver::~MediaSinksObserver() { 24 MediaSinksObserver::~MediaSinksObserver() {
25 #if DCHECK_IS_ON() 25 #if DCHECK_IS_ON()
26 DCHECK(!in_on_sinks_updated_); 26 DCHECK(!in_on_sinks_updated_);
27 #endif 27 #endif
28 28
29 if (initialized_) 29 if (initialized_)
30 router_->UnregisterMediaSinksObserver(this); 30 router_->UnregisterMediaSinksObserver(this);
31 } 31 }
32 32
33 bool MediaSinksObserver::Init() { 33 bool MediaSinksObserver::Init() {
34 if (initialized_) 34 if (initialized_)
35 return true; 35 return true;
36 36
37 initialized_ = router_->RegisterMediaSinksObserver(this); 37 initialized_ = router_->RegisterMediaSinksObserver(this);
38 return initialized_; 38 return initialized_;
39 } 39 }
40 40
41 void MediaSinksObserver::OnSinksUpdated( 41 void MediaSinksObserver::OnSinksUpdated(const std::vector<MediaSink>& sinks,
42 const std::vector<MediaSink>& sinks, 42 const std::vector<GURL>& origins) {
43 const std::vector<url::Origin>& origins) {
44 #if DCHECK_IS_ON() 43 #if DCHECK_IS_ON()
45 base::AutoReset<bool> reset_in_on_sinks_updated(&in_on_sinks_updated_, true); 44 base::AutoReset<bool> reset_in_on_sinks_updated(&in_on_sinks_updated_, true);
46 #endif 45 #endif
47 46
48 if (origins.empty() || base::ContainsValue(origins, origin_)) 47 if (origins.empty() || base::ContainsValue(origins, origin_))
49 OnSinksReceived(sinks); 48 OnSinksReceived(sinks);
50 else 49 else
51 OnSinksReceived(std::vector<MediaSink>()); 50 OnSinksReceived(std::vector<MediaSink>());
52 } 51 }
53 52
54 } // namespace media_router 53 } // namespace media_router
OLDNEW
« no previous file with comments | « chrome/browser/media/router/media_sinks_observer.h ('k') | chrome/browser/media/router/media_sinks_observer_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698