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

Unified Diff: chrome/browser/media/router/media_router_base.cc

Issue 2112673002: Removing references to Off the Record from MediaRouter (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: More refactoring Created 4 years, 5 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/router/media_router_base.cc
diff --git a/chrome/browser/media/router/media_router_base.cc b/chrome/browser/media/router/media_router_base.cc
index fd8a50d08a2778f8831c413745fec9723c8aa71d..8a941e3ce8b8a1be6ebdae60ad622952c14d296b 100644
--- a/chrome/browser/media/router/media_router_base.cc
+++ b/chrome/browser/media/router/media_router_base.cc
@@ -26,18 +26,18 @@ class MediaRouterBase::InternalMediaRoutesObserver
void OnRoutesUpdated(
const std::vector<MediaRoute>& routes,
const std::vector<MediaRoute::Id>& joinable_route_ids) override {
- off_the_record_route_ids.clear();
+ incognito_route_ids.clear();
// TODO(crbug.com/611486): Have the MRPM pass a list of joinable route ids
// via |joinable_route_ids|, and check here if it is non-empty.
has_route = !routes.empty();
for (const auto& route : routes) {
- if (route.off_the_record())
- off_the_record_route_ids.push_back(route.media_route_id());
+ if (route.incognito())
+ incognito_route_ids.push_back(route.media_route_id());
}
}
bool has_route;
- std::vector<MediaRoute::Id> off_the_record_route_ids;
+ std::vector<MediaRoute::Id> incognito_route_ids;
private:
DISALLOW_COPY_AND_ASSIGN(InternalMediaRoutesObserver);
@@ -66,9 +66,8 @@ MediaRouterBase::AddPresentationConnectionStateChangedCallback(
return callbacks->Add(callback);
}
-void MediaRouterBase::OnOffTheRecordProfileShutdown() {
- for (const auto& route_id :
- internal_routes_observer_->off_the_record_route_ids)
+void MediaRouterBase::OnIncognitoProfileShutdown() {
+ for (const auto& route_id : internal_routes_observer_->incognito_route_ids)
TerminateRoute(route_id);
}

Powered by Google App Engine
This is Rietveld 408576698