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

Side by Side Diff: chrome/browser/ui/ash/cast_config_delegate_media_router.cc

Issue 1507743005: [MediaRouter] Renames CloseRoute() to Terminate() and creates DetachRoute() (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Forgot a call to DetachRoute! Created 5 years 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/ui/ash/cast_config_delegate_media_router.h" 5 #include "chrome/browser/ui/ash/cast_config_delegate_media_router.h"
6 6
7 #include "base/strings/string_util.h" 7 #include "base/strings/string_util.h"
8 #include "base/strings/utf_string_conversions.h" 8 #include "base/strings/utf_string_conversions.h"
9 #include "chrome/browser/media/router/media_router.h" 9 #include "chrome/browser/media/router/media_router.h"
10 #include "chrome/browser/media/router/media_router_factory.h" 10 #include "chrome/browser/media/router/media_router_factory.h"
(...skipping 171 matching lines...) Expand 10 before | Expand all | Expand 10 after
182 182
183 void CastConfigDelegateMediaRouter::CastToReceiver( 183 void CastConfigDelegateMediaRouter::CastToReceiver(
184 const std::string& receiver_id) { 184 const std::string& receiver_id) {
185 GetMediaRouter()->CreateRoute( 185 GetMediaRouter()->CreateRoute(
186 media_router::MediaSourceForDesktop().id(), receiver_id, 186 media_router::MediaSourceForDesktop().id(), receiver_id,
187 GURL("http://cros-cast-origin/"), nullptr, 187 GURL("http://cros-cast-origin/"), nullptr,
188 std::vector<media_router::MediaRouteResponseCallback>()); 188 std::vector<media_router::MediaRouteResponseCallback>());
189 } 189 }
190 190
191 void CastConfigDelegateMediaRouter::StopCasting(const std::string& route_id) { 191 void CastConfigDelegateMediaRouter::StopCasting(const std::string& route_id) {
192 GetMediaRouter()->CloseRoute(route_id); 192 GetMediaRouter()->TerminateRoute(route_id);
193 } 193 }
194 194
195 bool CastConfigDelegateMediaRouter::HasOptions() const { 195 bool CastConfigDelegateMediaRouter::HasOptions() const {
196 // There are no plans to have an options page for the MediaRouter. 196 // There are no plans to have an options page for the MediaRouter.
197 return false; 197 return false;
198 } 198 }
199 199
200 void CastConfigDelegateMediaRouter::LaunchCastOptions() {} 200 void CastConfigDelegateMediaRouter::LaunchCastOptions() {}
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698