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

Side by Side Diff: media/remoting/remote_renderer_impl.cc

Issue 2568463003: media: Rename MediaKeys to ContentDecryptionModule (Closed)
Patch Set: Created 4 years 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 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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 "media/remoting/remote_renderer_impl.h" 5 #include "media/remoting/remote_renderer_impl.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <utility> 8 #include <utility>
9 9
10 #include "base/bind.h" 10 #include "base/bind.h"
11 #include "base/bind_helpers.h" 11 #include "base/bind_helpers.h"
12 #include "base/callback_helpers.h" 12 #include "base/callback_helpers.h"
13 #include "base/message_loop/message_loop.h" 13 #include "base/message_loop/message_loop.h"
14 #include "base/time/time.h" 14 #include "base/time/time.h"
15 #include "media/base/bind_to_current_loop.h" 15 #include "media/base/bind_to_current_loop.h"
16 #include "media/base/content_decryption_module.h"
jrummell 2016/12/12 22:08:40 nit: Don't think this is needed.
xhwang 2016/12/12 22:32:51 Done.
16 #include "media/base/demuxer_stream_provider.h" 17 #include "media/base/demuxer_stream_provider.h"
17 #include "media/base/media_keys.h"
18 #include "media/remoting/remote_demuxer_stream_adapter.h" 18 #include "media/remoting/remote_demuxer_stream_adapter.h"
19 #include "media/remoting/remoting_renderer_controller.h" 19 #include "media/remoting/remoting_renderer_controller.h"
20 #include "media/remoting/rpc/proto_enum_utils.h" 20 #include "media/remoting/rpc/proto_enum_utils.h"
21 #include "media/remoting/rpc/proto_utils.h" 21 #include "media/remoting/rpc/proto_utils.h"
22 22
23 namespace media { 23 namespace media {
24 24
25 RemoteRendererImpl::RemoteRendererImpl( 25 RemoteRendererImpl::RemoteRendererImpl(
26 scoped_refptr<base::SingleThreadTaskRunner> media_task_runner, 26 scoped_refptr<base::SingleThreadTaskRunner> media_task_runner,
27 const base::WeakPtr<RemotingRendererController>& 27 const base::WeakPtr<RemotingRendererController>&
(...skipping 540 matching lines...) Expand 10 before | Expand all | Expand 10 after
568 568
569 void RemoteRendererImpl::UpdateInterstitial() { 569 void RemoteRendererImpl::UpdateInterstitial() {
570 DCHECK(main_task_runner_->BelongsToCurrentThread()); 570 DCHECK(main_task_runner_->BelongsToCurrentThread());
571 571
572 interstitial_ui_.ShowInterstitial( 572 interstitial_ui_.ShowInterstitial(
573 remoting_renderer_controller_->remoting_source()->state() == 573 remoting_renderer_controller_->remoting_source()->state() ==
574 RemotingSessionState::SESSION_STARTED); 574 RemotingSessionState::SESSION_STARTED);
575 } 575 }
576 576
577 } // namespace media 577 } // namespace media
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698