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

Unified Diff: chrome/browser/ui/webui/media_router/media_router_ui.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 on rebased code 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/ui/webui/media_router/media_router_ui.cc
diff --git a/chrome/browser/ui/webui/media_router/media_router_ui.cc b/chrome/browser/ui/webui/media_router/media_router_ui.cc
index 6b8fba8c1a26b93c1b82aff983fbfd52999d5f3b..c9f1d30188c93b30d84a98281329bdcce3c2d5b8 100644
--- a/chrome/browser/ui/webui/media_router/media_router_ui.cc
+++ b/chrome/browser/ui/webui/media_router/media_router_ui.cc
@@ -369,15 +369,14 @@ bool MediaRouterUI::CreateRoute(const MediaSink::Id& sink_id,
GURL origin;
std::vector<MediaRouteResponseCallback> route_response_callbacks;
base::TimeDelta timeout;
- bool off_the_record;
+ bool incognito;
if (!SetRouteParameters(sink_id, cast_mode, &source_id, &origin,
- &route_response_callbacks, &timeout,
- &off_the_record)) {
+ &route_response_callbacks, &timeout, &incognito)) {
SendIssueForUnableToCast(cast_mode);
return false;
}
router_->CreateRoute(source_id, sink_id, origin, initiator_,
- route_response_callbacks, timeout, off_the_record);
+ route_response_callbacks, timeout, incognito);
return true;
}
@@ -388,7 +387,7 @@ bool MediaRouterUI::SetRouteParameters(
GURL* origin,
std::vector<MediaRouteResponseCallback>* route_response_callbacks,
base::TimeDelta* timeout,
- bool* off_the_record) {
+ bool* incognito) {
DCHECK(query_result_manager_.get());
DCHECK(initiator_);
@@ -455,7 +454,7 @@ bool MediaRouterUI::SetRouteParameters(
}
*timeout = GetRouteRequestTimeout(cast_mode);
- *off_the_record = Profile::FromWebUI(web_ui())->IsOffTheRecord();
+ *incognito = Profile::FromWebUI(web_ui())->IsOffTheRecord();
return true;
}
@@ -466,16 +465,14 @@ bool MediaRouterUI::ConnectRoute(const MediaSink::Id& sink_id,
GURL origin;
std::vector<MediaRouteResponseCallback> route_response_callbacks;
base::TimeDelta timeout;
- bool off_the_record;
+ bool incognito;
if (!SetRouteParameters(sink_id, MediaCastMode::DEFAULT, &source_id, &origin,
- &route_response_callbacks, &timeout,
- &off_the_record)) {
+ &route_response_callbacks, &timeout, &incognito)) {
SendIssueForUnableToCast(MediaCastMode::DEFAULT);
return false;
}
router_->ConnectRouteByRouteId(source_id, route_id, origin, initiator_,
- route_response_callbacks, timeout,
- off_the_record);
+ route_response_callbacks, timeout, incognito);
return true;
}
@@ -601,15 +598,14 @@ void MediaRouterUI::OnSearchSinkResponseReceived(
GURL origin;
std::vector<MediaRouteResponseCallback> route_response_callbacks;
base::TimeDelta timeout;
- bool off_the_record;
+ bool incognito;
if (!SetRouteParameters(found_sink_id, cast_mode, &source_id, &origin,
- &route_response_callbacks, &timeout,
- &off_the_record)) {
+ &route_response_callbacks, &timeout, &incognito)) {
SendIssueForUnableToCast(cast_mode);
return;
}
router_->CreateRoute(source_id, found_sink_id, origin, initiator_,
- route_response_callbacks, timeout, off_the_record);
+ route_response_callbacks, timeout, incognito);
}
void MediaRouterUI::SendIssueForRouteTimeout(

Powered by Google App Engine
This is Rietveld 408576698