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

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

Issue 2176613003: [Media Router] Clean up issues related code. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 5 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 <utility> 9 #include <utility>
10 10
(...skipping 467 matching lines...) Expand 10 before | Expand all | Expand 10 after
478 off_the_record); 478 off_the_record);
479 return true; 479 return true;
480 } 480 }
481 481
482 void MediaRouterUI::CloseRoute(const MediaRoute::Id& route_id) { 482 void MediaRouterUI::CloseRoute(const MediaRoute::Id& route_id) {
483 router_->TerminateRoute(route_id); 483 router_->TerminateRoute(route_id);
484 } 484 }
485 485
486 void MediaRouterUI::AddIssue(const Issue& issue) { router_->AddIssue(issue); } 486 void MediaRouterUI::AddIssue(const Issue& issue) { router_->AddIssue(issue); }
487 487
488 void MediaRouterUI::ClearIssue(const std::string& issue_id) { 488 void MediaRouterUI::ClearIssue(const Issue::Id& issue_id) {
489 router_->ClearIssue(issue_id); 489 router_->ClearIssue(issue_id);
490 } 490 }
491 491
492 void MediaRouterUI::SearchSinksAndCreateRoute( 492 void MediaRouterUI::SearchSinksAndCreateRoute(
493 const MediaSink::Id& sink_id, 493 const MediaSink::Id& sink_id,
494 const std::string& search_criteria, 494 const std::string& search_criteria,
495 const std::string& domain, 495 const std::string& domain,
496 MediaCastMode cast_mode) { 496 MediaCastMode cast_mode) {
497 auto source_id = query_result_manager_->GetSourceForCastMode(cast_mode).id(); 497 auto source_id = query_result_manager_->GetSourceForCastMode(cast_mode).id();
498 // The CreateRoute() part of the function is accomplished in the callback 498 // The CreateRoute() part of the function is accomplished in the callback
(...skipping 130 matching lines...) Expand 10 before | Expand all | Expand 10 after
629 IDS_MEDIA_ROUTER_ISSUE_CREATE_ROUTE_TIMEOUT_FOR_TAB); 629 IDS_MEDIA_ROUTER_ISSUE_CREATE_ROUTE_TIMEOUT_FOR_TAB);
630 break; 630 break;
631 case DESKTOP_MIRROR: 631 case DESKTOP_MIRROR:
632 issue_title = l10n_util::GetStringUTF8( 632 issue_title = l10n_util::GetStringUTF8(
633 IDS_MEDIA_ROUTER_ISSUE_CREATE_ROUTE_TIMEOUT_FOR_DESKTOP); 633 IDS_MEDIA_ROUTER_ISSUE_CREATE_ROUTE_TIMEOUT_FOR_DESKTOP);
634 break; 634 break;
635 default: 635 default:
636 NOTREACHED(); 636 NOTREACHED();
637 } 637 }
638 638
639 Issue issue(issue_title, std::string(), 639 AddIssue(Issue(issue_title, Issue::ActionType::DISMISS,
640 IssueAction(IssueAction::TYPE_DISMISS), 640 Issue::Severity::NOTIFICATION));
641 std::vector<IssueAction>(), std::string(), Issue::NOTIFICATION,
642 false, -1);
643 AddIssue(issue);
644 } 641 }
645 642
646 void MediaRouterUI::SendIssueForUnableToCast(MediaCastMode cast_mode) { 643 void MediaRouterUI::SendIssueForUnableToCast(MediaCastMode cast_mode) {
647 // For a generic error, claim a tab error unless it was specifically desktop 644 // For a generic error, claim a tab error unless it was specifically desktop
648 // mirroring. 645 // mirroring.
649 std::string issue_title = 646 std::string issue_title =
650 (cast_mode == MediaCastMode::DESKTOP_MIRROR) 647 (cast_mode == MediaCastMode::DESKTOP_MIRROR)
651 ? l10n_util::GetStringUTF8( 648 ? l10n_util::GetStringUTF8(
652 IDS_MEDIA_ROUTER_ISSUE_UNABLE_TO_CAST_DESKTOP) 649 IDS_MEDIA_ROUTER_ISSUE_UNABLE_TO_CAST_DESKTOP)
653 : l10n_util::GetStringUTF8( 650 : l10n_util::GetStringUTF8(
654 IDS_MEDIA_ROUTER_ISSUE_CREATE_ROUTE_TIMEOUT_FOR_TAB); 651 IDS_MEDIA_ROUTER_ISSUE_CREATE_ROUTE_TIMEOUT_FOR_TAB);
655 AddIssue(Issue(issue_title, std::string(), 652 AddIssue(
656 IssueAction(IssueAction::TYPE_DISMISS), 653 Issue(issue_title, Issue::ActionType::DISMISS, Issue::Severity::WARNING));
657 std::vector<IssueAction>(), std::string(), Issue::WARNING,
658 false, -1));
659 } 654 }
660 655
661 GURL MediaRouterUI::GetFrameURL() const { 656 GURL MediaRouterUI::GetFrameURL() const {
662 return presentation_request_ ? presentation_request_->frame_url() : GURL(); 657 return presentation_request_ ? presentation_request_->frame_url() : GURL();
663 } 658 }
664 659
665 std::string MediaRouterUI::GetPresentationRequestSourceName() const { 660 std::string MediaRouterUI::GetPresentationRequestSourceName() const {
666 GURL gurl = GetFrameURL(); 661 GURL gurl = GetFrameURL();
667 return gurl.SchemeIs(extensions::kExtensionScheme) 662 return gurl.SchemeIs(extensions::kExtensionScheme)
668 ? GetExtensionName(gurl, extensions::ExtensionRegistry::Get( 663 ? GetExtensionName(gurl, extensions::ExtensionRegistry::Get(
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
702 base::Time::Now() - start_time_); 697 base::Time::Now() - start_time_);
703 start_time_ = base::Time(); 698 start_time_ = base::Time();
704 } 699 }
705 } 700 }
706 701
707 void MediaRouterUI::UpdateMaxDialogHeight(int height) { 702 void MediaRouterUI::UpdateMaxDialogHeight(int height) {
708 handler_->UpdateMaxDialogHeight(height); 703 handler_->UpdateMaxDialogHeight(height);
709 } 704 }
710 705
711 } // namespace media_router 706 } // namespace media_router
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698