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

Side by Side Diff: chrome/browser/ui/webui/media_router/media_router_webui_message_handler.cc

Issue 2812953002: Stop passing raw pointers to base::Value API in c/b/ui (Closed)
Patch Set: No ListValue::SetDouble Created 3 years, 8 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 unified diff | Download patch
« no previous file with comments | « chrome/browser/ui/webui/instant_ui.cc ('k') | chrome/browser/ui/webui/nacl_ui.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/ui/webui/media_router/media_router_webui_message_handle r.h" 5 #include "chrome/browser/ui/webui/media_router/media_router_webui_message_handle r.h"
6 6
7 #include <memory>
7 #include <string> 8 #include <string>
8 #include <utility> 9 #include <utility>
9 10
10 #include "base/bind.h" 11 #include "base/bind.h"
11 #include "base/metrics/histogram_macros.h" 12 #include "base/metrics/histogram_macros.h"
12 #include "base/metrics/sparse_histogram.h" 13 #include "base/metrics/sparse_histogram.h"
13 #include "base/metrics/user_metrics.h" 14 #include "base/metrics/user_metrics.h"
14 #include "base/strings/string_util.h" 15 #include "base/strings/string_util.h"
15 #include "base/strings/stringprintf.h" 16 #include "base/strings/stringprintf.h"
16 #include "base/values.h" 17 #include "base/values.h"
(...skipping 107 matching lines...) Expand 10 before | Expand all | Expand 10 after
124 125
125 int cast_mode_bits = 0; 126 int cast_mode_bits = 0;
126 for (MediaCastMode cast_mode : sink_with_cast_modes.cast_modes) 127 for (MediaCastMode cast_mode : sink_with_cast_modes.cast_modes)
127 cast_mode_bits |= cast_mode; 128 cast_mode_bits |= cast_mode;
128 129
129 sink_val->SetInteger("castModes", cast_mode_bits); 130 sink_val->SetInteger("castModes", cast_mode_bits);
130 sink_val->SetBoolean("isPseudoSink", is_pseudo_sink); 131 sink_val->SetBoolean("isPseudoSink", is_pseudo_sink);
131 sinks_val->Append(std::move(sink_val)); 132 sinks_val->Append(std::move(sink_val));
132 } 133 }
133 134
134 sink_list_and_identity->Set("sinks", sinks_val.release()); 135 sink_list_and_identity->Set("sinks", std::move(sinks_val));
135 sink_list_and_identity->SetBoolean("showEmail", show_email); 136 sink_list_and_identity->SetBoolean("showEmail", show_email);
136 sink_list_and_identity->SetBoolean("showDomain", show_domain); 137 sink_list_and_identity->SetBoolean("showDomain", show_domain);
137 return sink_list_and_identity; 138 return sink_list_and_identity;
138 } 139 }
139 140
140 std::unique_ptr<base::DictionaryValue> RouteToValue( 141 std::unique_ptr<base::DictionaryValue> RouteToValue(
141 const MediaRoute& route, 142 const MediaRoute& route,
142 bool can_join, 143 bool can_join,
143 const std::string& extension_id, 144 const std::string& extension_id,
144 bool incognito, 145 bool incognito,
(...skipping 262 matching lines...) Expand 10 before | Expand all | Expand 10 after
407 DVLOG(1) << "OnRequestInitialData"; 408 DVLOG(1) << "OnRequestInitialData";
408 media_router_ui_->OnUIInitiallyLoaded(); 409 media_router_ui_->OnUIInitiallyLoaded();
409 base::DictionaryValue initial_data; 410 base::DictionaryValue initial_data;
410 411
411 // "No Cast devices found?" Chromecast help center page. 412 // "No Cast devices found?" Chromecast help center page.
412 initial_data.SetString("deviceMissingUrl", 413 initial_data.SetString("deviceMissingUrl",
413 base::StringPrintf(kHelpPageUrlPrefix, 3249268)); 414 base::StringPrintf(kHelpPageUrlPrefix, 3249268));
414 415
415 std::unique_ptr<base::DictionaryValue> sinks_and_identity( 416 std::unique_ptr<base::DictionaryValue> sinks_and_identity(
416 SinksAndIdentityToValue(media_router_ui_->sinks(), GetAccountInfo())); 417 SinksAndIdentityToValue(media_router_ui_->sinks(), GetAccountInfo()));
417 initial_data.Set("sinksAndIdentity", sinks_and_identity.release()); 418 initial_data.Set("sinksAndIdentity", std::move(sinks_and_identity));
418 419
419 std::unique_ptr<base::ListValue> routes(RoutesToValue( 420 std::unique_ptr<base::ListValue> routes(RoutesToValue(
420 media_router_ui_->routes(), media_router_ui_->joinable_route_ids(), 421 media_router_ui_->routes(), media_router_ui_->joinable_route_ids(),
421 media_router_ui_->routes_and_cast_modes())); 422 media_router_ui_->routes_and_cast_modes()));
422 initial_data.Set("routes", routes.release()); 423 initial_data.Set("routes", std::move(routes));
423 424
424 const std::set<MediaCastMode> cast_modes = media_router_ui_->cast_modes(); 425 const std::set<MediaCastMode> cast_modes = media_router_ui_->cast_modes();
425 std::unique_ptr<base::ListValue> cast_modes_list(CastModesToValue( 426 std::unique_ptr<base::ListValue> cast_modes_list(CastModesToValue(
426 cast_modes, media_router_ui_->GetPresentationRequestSourceName())); 427 cast_modes, media_router_ui_->GetPresentationRequestSourceName()));
427 initial_data.Set("castModes", cast_modes_list.release()); 428 initial_data.Set("castModes", std::move(cast_modes_list));
428 429
429 // If the cast mode last chosen for the current origin is tab mirroring, 430 // If the cast mode last chosen for the current origin is tab mirroring,
430 // that should be the cast mode initially selected in the dialog. Otherwise 431 // that should be the cast mode initially selected in the dialog. Otherwise
431 // the initial cast mode should be chosen automatically by the dialog. 432 // the initial cast mode should be chosen automatically by the dialog.
432 bool use_tab_mirroring = 433 bool use_tab_mirroring =
433 base::ContainsKey(cast_modes, MediaCastMode::TAB_MIRROR) && 434 base::ContainsKey(cast_modes, MediaCastMode::TAB_MIRROR) &&
434 media_router_ui_->UserSelectedTabMirroringForCurrentOrigin(); 435 media_router_ui_->UserSelectedTabMirroringForCurrentOrigin();
435 initial_data.SetBoolean("useTabMirroring", use_tab_mirroring); 436 initial_data.SetBoolean("useTabMirroring", use_tab_mirroring);
436 437
437 web_ui()->CallJavascriptFunctionUnsafe(kSetInitialData, initial_data); 438 web_ui()->CallJavascriptFunctionUnsafe(kSetInitialData, initial_data);
(...skipping 456 matching lines...) Expand 10 before | Expand all | Expand 10 after
894 } 895 }
895 896
896 return value; 897 return value;
897 } 898 }
898 899
899 void MediaRouterWebUIMessageHandler::SetWebUIForTest(content::WebUI* web_ui) { 900 void MediaRouterWebUIMessageHandler::SetWebUIForTest(content::WebUI* web_ui) {
900 set_web_ui(web_ui); 901 set_web_ui(web_ui);
901 } 902 }
902 903
903 } // namespace media_router 904 } // namespace media_router
OLDNEW
« no previous file with comments | « chrome/browser/ui/webui/instant_ui.cc ('k') | chrome/browser/ui/webui/nacl_ui.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698