| OLD | NEW | 
|    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/demuxer_stream_provider.h" |   16 #include "media/base/demuxer_stream_provider.h" | 
|   17 #include "media/base/media_keys.h" |  | 
|   18 #include "media/remoting/remote_demuxer_stream_adapter.h" |   17 #include "media/remoting/remote_demuxer_stream_adapter.h" | 
|   19 #include "media/remoting/remoting_renderer_controller.h" |   18 #include "media/remoting/remoting_renderer_controller.h" | 
|   20 #include "media/remoting/rpc/proto_enum_utils.h" |   19 #include "media/remoting/rpc/proto_enum_utils.h" | 
|   21 #include "media/remoting/rpc/proto_utils.h" |   20 #include "media/remoting/rpc/proto_utils.h" | 
|   22  |   21  | 
|   23 namespace media { |   22 namespace media { | 
|   24  |   23  | 
|   25 RemoteRendererImpl::RemoteRendererImpl( |   24 RemoteRendererImpl::RemoteRendererImpl( | 
|   26     scoped_refptr<base::SingleThreadTaskRunner> media_task_runner, |   25     scoped_refptr<base::SingleThreadTaskRunner> media_task_runner, | 
|   27     const base::WeakPtr<RemotingRendererController>& |   26     const base::WeakPtr<RemotingRendererController>& | 
| (...skipping 540 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  568  |  567  | 
|  569 void RemoteRendererImpl::UpdateInterstitial() { |  568 void RemoteRendererImpl::UpdateInterstitial() { | 
|  570   DCHECK(main_task_runner_->BelongsToCurrentThread()); |  569   DCHECK(main_task_runner_->BelongsToCurrentThread()); | 
|  571  |  570  | 
|  572   interstitial_ui_.ShowInterstitial( |  571   interstitial_ui_.ShowInterstitial( | 
|  573       remoting_renderer_controller_->remoting_source()->state() == |  572       remoting_renderer_controller_->remoting_source()->state() == | 
|  574       RemotingSessionState::SESSION_STARTED); |  573       RemotingSessionState::SESSION_STARTED); | 
|  575 } |  574 } | 
|  576  |  575  | 
|  577 }  // namespace media |  576 }  // namespace media | 
| OLD | NEW |