Chromium Code Reviews| OLD | NEW |
|---|---|
| 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/mojo/media_route_controller.h" | 5 #include "chrome/browser/media/router/mojo/media_route_controller.h" |
| 6 | 6 |
| 7 #include <utility> | 7 #include <utility> |
| 8 | 8 |
| 9 #include "chrome/browser/media/router/media_router.h" | 9 #include "chrome/browser/media/router/media_router.h" |
| 10 | 10 |
| (...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 62 mojo_media_controller_->SetMute(mute); | 62 mojo_media_controller_->SetMute(mute); |
| 63 } | 63 } |
| 64 | 64 |
| 65 void MediaRouteController::SetVolume(float volume) const { | 65 void MediaRouteController::SetVolume(float volume) const { |
| 66 DCHECK(is_valid_); | 66 DCHECK(is_valid_); |
| 67 mojo_media_controller_->SetVolume(volume); | 67 mojo_media_controller_->SetVolume(volume); |
| 68 } | 68 } |
| 69 | 69 |
| 70 void MediaRouteController::OnMediaStatusUpdated(const MediaStatus& status) { | 70 void MediaRouteController::OnMediaStatusUpdated(const MediaStatus& status) { |
| 71 DCHECK(is_valid_); | 71 DCHECK(is_valid_); |
| 72 current_media_status_ = base::make_optional<MediaStatus>(MediaStatus(status)); | |
|
mark a. foltz
2017/05/12 23:06:18
I don't think make_optional adds much here.
It loo
takumif
2017/05/15 17:57:29
Done.
| |
| 72 for (Observer& observer : observers_) | 73 for (Observer& observer : observers_) |
| 73 observer.OnMediaStatusUpdated(status); | 74 observer.OnMediaStatusUpdated(status); |
| 74 } | 75 } |
| 75 | 76 |
| 76 void MediaRouteController::Invalidate() { | 77 void MediaRouteController::Invalidate() { |
| 77 is_valid_ = false; | 78 is_valid_ = false; |
| 78 binding_.Close(); | 79 binding_.Close(); |
| 79 mojo_media_controller_.reset(); | 80 mojo_media_controller_.reset(); |
| 80 for (Observer& observer : observers_) | 81 for (Observer& observer : observers_) |
| 81 observer.InvalidateController(); | 82 observer.InvalidateController(); |
| (...skipping 25 matching lines...) Expand all Loading... | |
| 107 DCHECK(is_valid_); | 108 DCHECK(is_valid_); |
| 108 observers_.RemoveObserver(observer); | 109 observers_.RemoveObserver(observer); |
| 109 } | 110 } |
| 110 | 111 |
| 111 void MediaRouteController::OnMojoConnectionError() { | 112 void MediaRouteController::OnMojoConnectionError() { |
| 112 media_router_->DetachRouteController(route_id_, this); | 113 media_router_->DetachRouteController(route_id_, this); |
| 113 Invalidate(); | 114 Invalidate(); |
| 114 } | 115 } |
| 115 | 116 |
| 116 } // namespace media_router | 117 } // namespace media_router |
| OLD | NEW |