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

Unified Diff: chrome/browser/ui/webui/media_router/media_router_webui_message_handler.cc

Issue 1950223002: [Media Router WebUI] Don't let pseudo sinks alone show user email. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 7 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
« no previous file with comments | « no previous file | chrome/browser/ui/webui/media_router/media_router_webui_message_handler_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/webui/media_router/media_router_webui_message_handler.cc
diff --git a/chrome/browser/ui/webui/media_router/media_router_webui_message_handler.cc b/chrome/browser/ui/webui/media_router/media_router_webui_message_handler.cc
index 00eecdf4991d5cdc88ee802ff6b2d48528fd1b1d..f949a45098afd25800d455cdb5715920f0a7c97d 100644
--- a/chrome/browser/ui/webui/media_router/media_router_webui_message_handler.cc
+++ b/chrome/browser/ui/webui/media_router/media_router_webui_message_handler.cc
@@ -101,6 +101,8 @@ std::unique_ptr<base::DictionaryValue> SinksAndIdentityToValue(
if (!sink.description().empty())
sink_val->SetString("description", sink.description());
+ bool is_pseudo_sink =
+ base::StartsWith(sink.id(), "pseudo:", base::CompareCase::SENSITIVE);
if (!user_domain.empty() && !sink.domain().empty()) {
std::string domain = sink.domain();
// Convert default domains to user domain
@@ -114,9 +116,10 @@ std::unique_ptr<base::DictionaryValue> SinksAndIdentityToValue(
sink_val->SetString("domain", domain);
- show_email = true;
- if (!domain.empty() && domain != user_domain)
+ show_email = show_email || !is_pseudo_sink;
+ if (!domain.empty() && domain != user_domain) {
show_domain = true;
+ }
}
int cast_mode_bits = 0;
@@ -124,9 +127,7 @@ std::unique_ptr<base::DictionaryValue> SinksAndIdentityToValue(
cast_mode_bits |= cast_mode;
sink_val->SetInteger("castModes", cast_mode_bits);
- sink_val->SetBoolean(
- "isPseudoSink",
- base::StartsWith(sink.id(), "pseudo:", base::CompareCase::SENSITIVE));
+ sink_val->SetBoolean("isPseudoSink", is_pseudo_sink);
sinks_val->Append(sink_val.release());
}
« no previous file with comments | « no previous file | chrome/browser/ui/webui/media_router/media_router_webui_message_handler_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698