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

Side by Side Diff: chrome/browser/media/router/media_router_mojo_impl.cc

Issue 1550593002: Switch to standard integer types in chrome/browser/, part 2 of 4. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 12 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/media/router/media_router_mojo_impl.h" 5 #include "chrome/browser/media/router/media_router_mojo_impl.h"
6 6
7 #include <stddef.h>
8
7 #include "base/bind.h" 9 #include "base/bind.h"
8 #include "base/guid.h" 10 #include "base/guid.h"
9 #include "base/logging.h" 11 #include "base/logging.h"
10 #include "base/memory/scoped_vector.h" 12 #include "base/memory/scoped_vector.h"
11 #include "base/observer_list.h" 13 #include "base/observer_list.h"
12 #include "base/stl_util.h" 14 #include "base/stl_util.h"
13 #include "base/strings/stringprintf.h" 15 #include "base/strings/stringprintf.h"
14 #include "chrome/browser/media/router/issues_observer.h" 16 #include "chrome/browser/media/router/issues_observer.h"
15 #include "chrome/browser/media/router/local_media_routes_observer.h" 17 #include "chrome/browser/media/router/local_media_routes_observer.h"
16 #include "chrome/browser/media/router/media_router_factory.h" 18 #include "chrome/browser/media/router/media_router_factory.h"
(...skipping 319 matching lines...) Expand 10 before | Expand all | Expand 10 after
336 const SendRouteMessageCallback& callback) { 338 const SendRouteMessageCallback& callback) {
337 DCHECK(thread_checker_.CalledOnValidThread()); 339 DCHECK(thread_checker_.CalledOnValidThread());
338 340
339 SetWakeReason(MediaRouteProviderWakeReason::SEND_SESSION_MESSAGE); 341 SetWakeReason(MediaRouteProviderWakeReason::SEND_SESSION_MESSAGE);
340 RunOrDefer(base::Bind(&MediaRouterMojoImpl::DoSendSessionMessage, 342 RunOrDefer(base::Bind(&MediaRouterMojoImpl::DoSendSessionMessage,
341 base::Unretained(this), route_id, message, callback)); 343 base::Unretained(this), route_id, message, callback));
342 } 344 }
343 345
344 void MediaRouterMojoImpl::SendRouteBinaryMessage( 346 void MediaRouterMojoImpl::SendRouteBinaryMessage(
345 const MediaRoute::Id& route_id, 347 const MediaRoute::Id& route_id,
346 scoped_ptr<std::vector<uint8>> data, 348 scoped_ptr<std::vector<uint8_t>> data,
347 const SendRouteMessageCallback& callback) { 349 const SendRouteMessageCallback& callback) {
348 DCHECK(thread_checker_.CalledOnValidThread()); 350 DCHECK(thread_checker_.CalledOnValidThread());
349 351
350 SetWakeReason(MediaRouteProviderWakeReason::SEND_SESSION_BINARY_MESSAGE); 352 SetWakeReason(MediaRouteProviderWakeReason::SEND_SESSION_BINARY_MESSAGE);
351 RunOrDefer(base::Bind(&MediaRouterMojoImpl::DoSendSessionBinaryMessage, 353 RunOrDefer(base::Bind(&MediaRouterMojoImpl::DoSendSessionBinaryMessage,
352 base::Unretained(this), route_id, 354 base::Unretained(this), route_id,
353 base::Passed(data.Pass()), callback)); 355 base::Passed(data.Pass()), callback));
354 } 356 }
355 357
356 void MediaRouterMojoImpl::AddIssue(const Issue& issue) { 358 void MediaRouterMojoImpl::AddIssue(const Issue& issue) {
(...skipping 207 matching lines...) Expand 10 before | Expand all | Expand 10 after
564 void MediaRouterMojoImpl::DoSendSessionMessage( 566 void MediaRouterMojoImpl::DoSendSessionMessage(
565 const MediaRoute::Id& route_id, 567 const MediaRoute::Id& route_id,
566 const std::string& message, 568 const std::string& message,
567 const SendRouteMessageCallback& callback) { 569 const SendRouteMessageCallback& callback) {
568 DVLOG_WITH_INSTANCE(1) << "SendRouteMessage " << route_id; 570 DVLOG_WITH_INSTANCE(1) << "SendRouteMessage " << route_id;
569 media_route_provider_->SendRouteMessage(route_id, message, callback); 571 media_route_provider_->SendRouteMessage(route_id, message, callback);
570 } 572 }
571 573
572 void MediaRouterMojoImpl::DoSendSessionBinaryMessage( 574 void MediaRouterMojoImpl::DoSendSessionBinaryMessage(
573 const MediaRoute::Id& route_id, 575 const MediaRoute::Id& route_id,
574 scoped_ptr<std::vector<uint8>> data, 576 scoped_ptr<std::vector<uint8_t>> data,
575 const SendRouteMessageCallback& callback) { 577 const SendRouteMessageCallback& callback) {
576 DVLOG_WITH_INSTANCE(1) << "SendRouteBinaryMessage " << route_id; 578 DVLOG_WITH_INSTANCE(1) << "SendRouteBinaryMessage " << route_id;
577 mojo::Array<uint8> mojo_array; 579 mojo::Array<uint8_t> mojo_array;
578 mojo_array.Swap(data.get()); 580 mojo_array.Swap(data.get());
579 media_route_provider_->SendRouteBinaryMessage(route_id, mojo_array.Pass(), 581 media_route_provider_->SendRouteBinaryMessage(route_id, mojo_array.Pass(),
580 callback); 582 callback);
581 } 583 }
582 584
583 void MediaRouterMojoImpl::DoListenForRouteMessages( 585 void MediaRouterMojoImpl::DoListenForRouteMessages(
584 const MediaRoute::Id& route_id) { 586 const MediaRoute::Id& route_id) {
585 DVLOG_WITH_INSTANCE(1) << "ListenForRouteMessages"; 587 DVLOG_WITH_INSTANCE(1) << "ListenForRouteMessages";
586 if (!ContainsValue(route_ids_listening_for_messages_, route_id)) { 588 if (!ContainsValue(route_ids_listening_for_messages_, route_id)) {
587 route_ids_listening_for_messages_.insert(route_id); 589 route_ids_listening_for_messages_.insert(route_id);
(...skipping 240 matching lines...) Expand 10 before | Expand all | Expand 10 after
828 if (current_wake_reason_ == MediaRouteProviderWakeReason::TOTAL_COUNT) 830 if (current_wake_reason_ == MediaRouteProviderWakeReason::TOTAL_COUNT)
829 current_wake_reason_ = reason; 831 current_wake_reason_ = reason;
830 } 832 }
831 833
832 void MediaRouterMojoImpl::ClearWakeReason() { 834 void MediaRouterMojoImpl::ClearWakeReason() {
833 DCHECK(current_wake_reason_ != MediaRouteProviderWakeReason::TOTAL_COUNT); 835 DCHECK(current_wake_reason_ != MediaRouteProviderWakeReason::TOTAL_COUNT);
834 current_wake_reason_ = MediaRouteProviderWakeReason::TOTAL_COUNT; 836 current_wake_reason_ = MediaRouteProviderWakeReason::TOTAL_COUNT;
835 } 837 }
836 838
837 } // namespace media_router 839 } // namespace media_router
OLDNEW
« no previous file with comments | « chrome/browser/media/router/media_router_mojo_impl.h ('k') | chrome/browser/media/router/media_router_mojo_impl_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698