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

Unified Diff: chrome/browser/media/android/router/media_router_android.cc

Issue 1415103006: Non-Local Join for Media Router and Presentation API (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixing ChromeOS System Tray Test Created 4 years, 11 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/media/android/router/media_router_android.cc
diff --git a/chrome/browser/media/android/router/media_router_android.cc b/chrome/browser/media/android/router/media_router_android.cc
index 7cdae90464880b86486bdf4a3b9715425d8355ed..8a753b95dcf020a5aeff802d3433df0f59c56cdf 100644
--- a/chrome/browser/media/android/router/media_router_android.cc
+++ b/chrome/browser/media/android/router/media_router_android.cc
@@ -116,6 +116,15 @@ void MediaRouterAndroid::CreateRoute(
route_request_id);
}
+void MediaRouterAndroid::ConnectRouteByRouteId(
+ const MediaSource::Id& source,
+ const MediaRoute::Id& route_id,
+ const GURL& origin,
+ content::WebContents* web_contents,
+ const std::vector<MediaRouteResponseCallback>& callbacks) {
+ NOTIMPLEMENTED();
+}
+
void MediaRouterAndroid::JoinRoute(
const MediaSource::Id& source_id,
const std::string& presentation_id,
@@ -270,6 +279,9 @@ void MediaRouterAndroid::UnregisterMediaSinksObserver(
void MediaRouterAndroid::RegisterMediaRoutesObserver(
MediaRoutesObserver* observer) {
DVLOG(2) << "Added MediaRoutesObserver: " << observer;
+ if (!observer->source_id().empty())
+ NOTIMPLEMENTED() << "Joinable routes query not implemented.";
+
routes_observers_.AddObserver(observer);
}
@@ -375,7 +387,7 @@ void MediaRouterAndroid::OnRouteCreated(
active_routes_.push_back(route);
FOR_EACH_OBSERVER(MediaRoutesObserver, routes_observers_,
- OnRoutesUpdated(active_routes_));
+ OnRoutesUpdated(active_routes_, std::vector<MediaRoute::Id>()));
}
void MediaRouterAndroid::OnRouteRequestError(
@@ -407,7 +419,7 @@ void MediaRouterAndroid::OnRouteClosed(
}
FOR_EACH_OBSERVER(MediaRoutesObserver, routes_observers_,
- OnRoutesUpdated(active_routes_));
+ OnRoutesUpdated(active_routes_, std::vector<MediaRoute::Id>()));
}
void MediaRouterAndroid::OnMessageSentResult(JNIEnv* env,
« no previous file with comments | « chrome/browser/media/android/router/media_router_android.h ('k') | chrome/browser/media/router/media_router.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698