[Media Router] Add cloud services preferences.

chrome/browser/ui/webui/media_router/media_router_webui_message_handler.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/webui/media_router/media_router_webui_message_handler.h"
 
 #include <string>
 
 #include "base/bind.h"
 #include "base/metrics/histogram_macros.h"
@@ skipping 331 matching lines @@
       media_router_ui_->joinable_route_ids(),
       media_router_ui_->GetRouteProviderExtensionId()));
   initial_data.Set("routes", routes.release());
 
   const std::set<MediaCastMode> cast_modes = media_router_ui_->cast_modes();
   scoped_ptr<base::ListValue> cast_modes_list(
       CastModesToValue(cast_modes,
                        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);
+#if defined(GOOGLE_CHROME_BUILD)
+  bool show_cloud_pref = profile->IsSyncAllowed() &&

[imcheng, 2016/01/25 19:21:06]

can this be replaced with whether the kMediaRouterEnableCloudServices preference
is already set?

[imcheng, 2016/01/25 19:21:06]

Why is IsSyncAllowed() checked here? Could you add some comments?

[apacible, 2016/01/26 01:12:56]

Added comments.

Per discussion with product, we only want to show the acknowledgement if sync is
enabled. When the user enables sync on Chrome, that action is treated as opting
into Google/proprietary services, including cloud services (via discussion
w/privacy). In that case, we'll enable cloud services for that user and mark the
pref as set.

[apacible, 2016/01/26 01:12:56]

I'm not sure I understand this comment. kMediaRouterEnableCloudServices
preference defaults to false. We have a second preference to keep track of
whether or not it's already been set, used in line 362.

+      !profile->GetPrefs()->GetBoolean(
+          prefs::kMediaRouterCloudServicesPrefSet);
+  initial_data.SetBoolean("showFirstRunFlowCloudPref", show_cloud_pref);
+#endif  // defined(GOOGLE_CHROME_BUILD)
 
   web_ui()->CallJavascriptFunction(kSetInitialData, initial_data);
   media_router_ui_->UIInitialized();
 }
 
 void MediaRouterWebUIMessageHandler::OnCreateRoute(
     const base::ListValue* args) {
   DVLOG(1) << "OnCreateRoute";
   const base::DictionaryValue* args_dict = nullptr;
   std::string sink_id;
@@ skipping 41 matching lines @@
     // request.
     DVLOG(1) << "Error initiating route request.";
   }
 }
 
 void MediaRouterWebUIMessageHandler::OnAcknowledgeFirstRunFlow(
     const base::ListValue* args) {
   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(
     const base::ListValue* args) {
   DVLOG(1) << "OnActOnIssue";
   const base::DictionaryValue* args_dict = nullptr;
   Issue::Id issue_id;
   int action_type_num = -1;
   if (!args->GetDictionary(0, &args_dict) ||
       !args_dict->GetString("issueId", &issue_id) ||
@@ skipping 203 matching lines @@
     open_args->AppendString(learn_more_url);
     web_ui()->CallJavascriptFunction(kWindowOpen, *open_args);
     return true;
   } else {
     // Do nothing; no other issue action types require any other action.
     return true;
   }
 }
 
 }  // namespace media_router