[Media Router] Make per-hostname cast mode selections persist

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 <utility>
 
 #include "base/bind.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/metrics/sparse_histogram.h"
 #include "base/metrics/user_metrics.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/values.h"
 #include "chrome/browser/media/router/issue.h"
 #include "chrome/browser/media/router/media_router_metrics.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/signin/signin_manager_factory.h"
 #include "chrome/browser/sync/profile_sync_service_factory.h"
+#include "chrome/browser/ui/webui/media_router/media_cast_mode.h"
 #include "chrome/browser/ui/webui/media_router/media_router_ui.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/grit/generated_resources.h"
 #include "components/browser_sync/profile_sync_service.h"
 #include "components/prefs/pref_service.h"
 #include "components/signin/core/browser/signin_manager.h"
 #include "content/public/browser/web_ui.h"
 #include "extensions/common/constants.h"
 #include "ui/base/l10n/l10n_util.h"
 
@@ skipping 380 matching lines @@
   std::unique_ptr<base::ListValue> routes(RoutesToValue(
       media_router_ui_->routes(), media_router_ui_->joinable_route_ids(),
       media_router_ui_->current_cast_modes()));
   initial_data.Set("routes", routes.release());
 
   const std::set<MediaCastMode> cast_modes = media_router_ui_->cast_modes();
   std::unique_ptr<base::ListValue> cast_modes_list(CastModesToValue(
       cast_modes, media_router_ui_->GetPresentationRequestSourceName()));
   initial_data.Set("castModes", cast_modes_list.release());
 
+  // If the cast mode last chosen for the current hostname is tab mirroring,
+  // that should be the cast mode initially selected in the dialog. Otherwise
+  // the initial cast mode should be chosen automatically by the dialog.
+  bool use_tab_mirroring =
+      base::ContainsKey(cast_modes, MediaCastMode::TAB_MIRROR) &&
+      media_router_ui_->UserSelectedTabMirroringForCurrentHost();

[apacible, 2016/11/16 18:51:10]

nitty nit: indent four spaces.

[takumif, 2016/11/17 01:54:51]

Do you mean that L428 should be indented by four more spaces compared to L427?
"git cl format" fixes that to this.

[apacible, 2016/11/30 21:54:24]

Yes, but I defer to the formatting tool. I'd gotten feedback to have four more
spaces to indent when I started, so that's what I've been doing.

+  initial_data.SetBoolean("useTabMirroring", use_tab_mirroring);
+
   web_ui()->CallJavascriptFunctionUnsafe(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;
   int cast_mode_num = -1;
@@ skipping 257 matching lines @@
 }
 
 void MediaRouterWebUIMessageHandler::OnReportSelectedCastMode(
     const base::ListValue* args) {
   DVLOG(1) << "OnReportSelectedCastMode";
   int cast_mode_type;
   if (!args->GetInteger(0, &cast_mode_type)) {
     DVLOG(1) << "Unable to extract args.";
     return;
   }
+  DCHECK(IsValidCastModeNum(cast_mode_type));
   UMA_HISTOGRAM_SPARSE_SLOWLY("MediaRouter.Ui.Navigate.SourceSelection",
                               cast_mode_type);
+  media_router_ui_->RecordCastModeSelection(
+      static_cast<MediaCastMode>(cast_mode_type));
 }
 
 void MediaRouterWebUIMessageHandler::OnReportSinkCount(
     const base::ListValue* args) {
   DVLOG(1) << "OnReportSinkCount";
   int sink_count;
   if (!args->GetInteger(0, &sink_count)) {
     DVLOG(1) << "Unable to extract args.";
     return;
   }
@@ skipping 169 matching lines @@
   }
 
   return value;
 }
 
 void MediaRouterWebUIMessageHandler::SetWebUIForTest(content::WebUI* web_ui) {
   set_web_ui(web_ui);
 }
 
 }  // namespace media_router