Index: media/remoting/situational_renderer_factory.h |
diff --git a/media/remoting/remoting_renderer_factory.h b/media/remoting/situational_renderer_factory.h |
similarity index 51% |
rename from media/remoting/remoting_renderer_factory.h |
rename to media/remoting/situational_renderer_factory.h |
index d4596c2d318881585dbd70cadec5376226d6e332..561ebac01e99b49d42a3144f3c03ffa02d2a0cea 100644 |
--- a/media/remoting/remoting_renderer_factory.h |
+++ b/media/remoting/situational_renderer_factory.h |
@@ -2,22 +2,23 @@ |
// Use of this source code is governed by a BSD-style license that can be |
// found in the LICENSE file. |
-#ifndef MEDIA_REMOTING_REMOTING_RENDERER_FACTORY_H_ |
-#define MEDIA_REMOTING_REMOTING_RENDERER_FACTORY_H_ |
+#ifndef MEDIA_REMOTING_SITUATIONAL_RENDERER_FACTORY_H_ |
+#define MEDIA_REMOTING_SITUATIONAL_RENDERER_FACTORY_H_ |
#include "media/base/renderer_factory.h" |
-#include "media/remoting/remoting_renderer_controller.h" |
+#include "media/remoting/user_experience_controller.h" |
namespace media { |
+namespace remoting { |
-// Create renderer for local playback or remoting according to info from |
-// |remoting_renderer_controller|. |
-class RemotingRendererFactory : public RendererFactory { |
+// Creates Renderers for either local playback or remote playback, as directed |
+// by the UserExperienceController. |
+class SituationalRendererFactory : public RendererFactory { |
xjz
2017/01/21 06:12:34
naming nit: How about AdaptiveRendererFactory?
miu
2017/01/23 20:57:37
Hmm...I had a hard time naming this class. Could y
xjz
2017/01/23 23:08:13
I hesitated between AdaptiveRendererFactory and Co
miu
2017/01/24 00:19:40
Done. I suppose since the class owns the controlle
|
public: |
- RemotingRendererFactory( |
+ SituationalRendererFactory( |
std::unique_ptr<RendererFactory> default_renderer_factory, |
- std::unique_ptr<RemotingRendererController> remoting_renderer_controller); |
- ~RemotingRendererFactory() override; |
+ std::unique_ptr<UserExperienceController> controller); |
+ ~SituationalRendererFactory() override; |
std::unique_ptr<Renderer> CreateRenderer( |
const scoped_refptr<base::SingleThreadTaskRunner>& media_task_runner, |
@@ -28,12 +29,12 @@ class RemotingRendererFactory : public RendererFactory { |
private: |
const std::unique_ptr<RendererFactory> default_renderer_factory_; |
- const std::unique_ptr<RemotingRendererController> |
- remoting_renderer_controller_; |
+ const std::unique_ptr<UserExperienceController> controller_; |
- DISALLOW_COPY_AND_ASSIGN(RemotingRendererFactory); |
+ DISALLOW_COPY_AND_ASSIGN(SituationalRendererFactory); |
}; |
+} // namespace remoting |
} // namespace media |
-#endif // MEDIA_REMOTING_REMOTING_RENDERER_FACTORY_H_ |
+#endif // MEDIA_REMOTING_SITUATIONAL_RENDERER_FACTORY_H_ |