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

Side by Side Diff: components/html_viewer/web_media_player_factory.cc

Issue 1121783003: Move navigations with POST or referrer to the shell. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: merge Created 5 years, 7 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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 "components/html_viewer/web_media_player_factory.h" 5 #include "components/html_viewer/web_media_player_factory.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/files/file_path.h" 8 #include "base/files/file_path.h"
9 #include "base/path_service.h" 9 #include "base/path_service.h"
10 #include "base/threading/thread.h" 10 #include "base/threading/thread.h"
(...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after
83 blink::WebContentDecryptionModule* initial_cdm, 83 blink::WebContentDecryptionModule* initial_cdm,
84 mojo::Shell* shell) { 84 mojo::Shell* shell) {
85 #if defined(OS_ANDROID) 85 #if defined(OS_ANDROID)
86 return nullptr; 86 return nullptr;
87 #else 87 #else
88 scoped_refptr<media::MediaLog> media_log(new media::MediaLog()); 88 scoped_refptr<media::MediaLog> media_log(new media::MediaLog());
89 scoped_ptr<media::RendererFactory> media_renderer_factory; 89 scoped_ptr<media::RendererFactory> media_renderer_factory;
90 90
91 if (enable_mojo_media_renderer_) { 91 if (enable_mojo_media_renderer_) {
92 ServiceProviderPtr media_renderer_service_provider; 92 ServiceProviderPtr media_renderer_service_provider;
93 mojo::URLRequestPtr request(mojo::URLRequest::New());
94 request->url = mojo::String::From("mojo:media");
93 shell->ConnectToApplication( 95 shell->ConnectToApplication(
94 "mojo:media", GetProxy(&media_renderer_service_provider), nullptr); 96 request.Pass(), GetProxy(&media_renderer_service_provider), nullptr);
95 media_renderer_factory.reset(new media::MojoRendererFactory(make_scoped_ptr( 97 media_renderer_factory.reset(new media::MojoRendererFactory(make_scoped_ptr(
96 new RendererServiceProvider(media_renderer_service_provider.Pass())))); 98 new RendererServiceProvider(media_renderer_service_provider.Pass()))));
97 } else { 99 } else {
98 media_renderer_factory.reset( 100 media_renderer_factory.reset(
99 new media::DefaultRendererFactory(media_log, 101 new media::DefaultRendererFactory(media_log,
100 nullptr, // No GPU factory. 102 nullptr, // No GPU factory.
101 GetAudioHardwareConfig())); 103 GetAudioHardwareConfig()));
102 } 104 }
103 105
104 media::WebMediaPlayerParams params( 106 media::WebMediaPlayerParams params(
(...skipping 23 matching lines...) Expand all
128 130
129 scoped_refptr<base::SingleThreadTaskRunner> 131 scoped_refptr<base::SingleThreadTaskRunner>
130 WebMediaPlayerFactory::GetMediaThreadTaskRunner() { 132 WebMediaPlayerFactory::GetMediaThreadTaskRunner() {
131 if (!media_thread_.IsRunning()) 133 if (!media_thread_.IsRunning())
132 media_thread_.Start(); 134 media_thread_.Start();
133 135
134 return media_thread_.message_loop_proxy(); 136 return media_thread_.message_loop_proxy();
135 } 137 }
136 138
137 } // namespace html_viewer 139 } // namespace html_viewer
OLDNEW
« no previous file with comments | « components/html_viewer/html_viewer.cc ('k') | components/resource_provider/public/cpp/resource_loader.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698