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

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

Issue 2664753002: Remove base::StringValue (Closed)
Patch Set: Rebase Created 3 years, 9 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
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_ui.h" 5 #include "chrome/browser/ui/webui/media_router/media_router_ui.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <string> 8 #include <string>
9 #include <unordered_map> 9 #include <unordered_map>
10 #include <utility> 10 #include <utility>
(...skipping 515 matching lines...) Expand 10 before | Expand all | Expand 10 after
526 router_->SearchSinks( 526 router_->SearchSinks(
527 sink_id, source_id, search_criteria, domain, 527 sink_id, source_id, search_criteria, domain,
528 base::Bind(&MediaRouterUI::OnSearchSinkResponseReceived, 528 base::Bind(&MediaRouterUI::OnSearchSinkResponseReceived,
529 weak_factory_.GetWeakPtr(), cast_mode)); 529 weak_factory_.GetWeakPtr(), cast_mode));
530 } 530 }
531 531
532 bool MediaRouterUI::UserSelectedTabMirroringForCurrentOrigin() const { 532 bool MediaRouterUI::UserSelectedTabMirroringForCurrentOrigin() const {
533 const base::ListValue* origins = 533 const base::ListValue* origins =
534 Profile::FromWebUI(web_ui())->GetPrefs()->GetList( 534 Profile::FromWebUI(web_ui())->GetPrefs()->GetList(
535 prefs::kMediaRouterTabMirroringSources); 535 prefs::kMediaRouterTabMirroringSources);
536 return origins->Find(base::StringValue(GetSerializedInitiatorOrigin())) != 536 return origins->Find(base::Value(GetSerializedInitiatorOrigin())) !=
537 origins->end(); 537 origins->end();
538 } 538 }
539 539
540 void MediaRouterUI::RecordCastModeSelection(MediaCastMode cast_mode) { 540 void MediaRouterUI::RecordCastModeSelection(MediaCastMode cast_mode) {
541 ListPrefUpdate update(Profile::FromWebUI(web_ui())->GetPrefs(), 541 ListPrefUpdate update(Profile::FromWebUI(web_ui())->GetPrefs(),
542 prefs::kMediaRouterTabMirroringSources); 542 prefs::kMediaRouterTabMirroringSources);
543 543
544 switch (cast_mode) { 544 switch (cast_mode) {
545 case MediaCastMode::DEFAULT: 545 case MediaCastMode::DEFAULT:
546 update->Remove(base::StringValue(GetSerializedInitiatorOrigin()), 546 update->Remove(base::Value(GetSerializedInitiatorOrigin()), nullptr);
547 nullptr);
548 break; 547 break;
549 case MediaCastMode::TAB_MIRROR: 548 case MediaCastMode::TAB_MIRROR:
550 update->AppendIfNotPresent( 549 update->AppendIfNotPresent(
551 base::MakeUnique<base::StringValue>(GetSerializedInitiatorOrigin())); 550 base::MakeUnique<base::Value>(GetSerializedInitiatorOrigin()));
552 break; 551 break;
553 case MediaCastMode::DESKTOP_MIRROR: 552 case MediaCastMode::DESKTOP_MIRROR:
554 // Desktop mirroring isn't domain-specific, so we don't record the 553 // Desktop mirroring isn't domain-specific, so we don't record the
555 // selection. 554 // selection.
556 break; 555 break;
557 default: 556 default:
558 NOTREACHED(); 557 NOTREACHED();
559 break; 558 break;
560 } 559 }
561 } 560 }
(...skipping 200 matching lines...) Expand 10 before | Expand all | Expand 10 after
762 } 761 }
763 762
764 std::string MediaRouterUI::GetSerializedInitiatorOrigin() const { 763 std::string MediaRouterUI::GetSerializedInitiatorOrigin() const {
765 url::Origin origin = initiator_ 764 url::Origin origin = initiator_
766 ? url::Origin(initiator_->GetLastCommittedURL()) 765 ? url::Origin(initiator_->GetLastCommittedURL())
767 : url::Origin(); 766 : url::Origin();
768 return origin.Serialize(); 767 return origin.Serialize();
769 } 768 }
770 769
771 } // namespace media_router 770 } // namespace media_router
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698