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

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

Issue 1582943003: [Media Router] Add cloud services preferences. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase. 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
« no previous file with comments | « chrome/browser/resources/media_router/media_router_ui_interface.js ('k') | chrome/common/pref_names.h » ('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 84e316edc3b1b6c2ec55e1d6c91bc410f945e3f2..8a9a427f47fa1c085602eadfafe830ec68e47168 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
@@ -348,11 +348,24 @@ void MediaRouterWebUIMessageHandler::OnRequestInitialData(
media_router_ui_->GetPresentationRequestSourceName()));
initial_data.Set("castModes", cast_modes_list.release());
+ Profile* profile = Profile::FromWebUI(web_ui());
+
bool first_run_flow_acknowledged =
- Profile::FromWebUI(web_ui())->GetPrefs()->GetBoolean(
+ profile->GetPrefs()->GetBoolean(
prefs::kMediaRouterFirstRunFlowAcknowledged);
initial_data.SetBoolean("wasFirstRunFlowAcknowledged",
first_run_flow_acknowledged);
+ bool show_cloud_pref = false;
+#if defined(GOOGLE_CHROME_BUILD)
+ // Cloud services preference is shown if user has sync enabled.
+ // If the user enables sync after acknowledging the first run flow, this is
+ // treated as the user opting into Google services, including cloud services,
+ // if the browser is a Chrome branded build.
+ show_cloud_pref = profile->IsSyncAllowed() &&
+ !profile->GetPrefs()->GetBoolean(
+ prefs::kMediaRouterCloudServicesPrefSet);
+#endif // defined(GOOGLE_CHROME_BUILD)
+ initial_data.SetBoolean("showFirstRunFlowCloudPref", show_cloud_pref);
web_ui()->CallJavascriptFunction(kSetInitialData, initial_data);
media_router_ui_->UIInitialized();
@@ -414,6 +427,19 @@ void MediaRouterWebUIMessageHandler::OnAcknowledgeFirstRunFlow(
DVLOG(1) << "OnAcknowledgeFirstRunFlow";
Profile::FromWebUI(web_ui())->GetPrefs()->SetBoolean(
prefs::kMediaRouterFirstRunFlowAcknowledged, true);
+
+#if defined(GOOGLE_CHROME_BUILD)
+ bool enabled_cloud_services = false;
+ if (!args->GetBoolean(0, &enabled_cloud_services)) {
+ DVLOG(1) << "Unable to extract args.";
+ return;
+ }
+
+ Profile::FromWebUI(web_ui())->GetPrefs()->SetBoolean(
+ prefs::kMediaRouterEnableCloudServices, enabled_cloud_services);
+ Profile::FromWebUI(web_ui())->GetPrefs()->SetBoolean(
+ prefs::kMediaRouterCloudServicesPrefSet, true);
+#endif // defined(GOOGLE_CHROME_BUILD)
}
void MediaRouterWebUIMessageHandler::OnActOnIssue(
« no previous file with comments | « chrome/browser/resources/media_router/media_router_ui_interface.js ('k') | chrome/common/pref_names.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698