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

Side by Side Diff: chromecast/browser/cast_content_browser_client.cc

Issue 1947313002: Enable content embedders to specify mojo application task runner. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: restores mojo:media in browser Created 4 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 "chromecast/browser/cast_content_browser_client.h" 5 #include "chromecast/browser/cast_content_browser_client.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include <string> 9 #include <string>
10 #include <utility> 10 #include <utility>
(...skipping 376 matching lines...) Expand 10 before | Expand all | Expand 10 after
387 int opener_render_view_id, 387 int opener_render_view_id,
388 int opener_render_frame_id, 388 int opener_render_frame_id,
389 bool* no_javascript_access) { 389 bool* no_javascript_access) {
390 *no_javascript_access = true; 390 *no_javascript_access = true;
391 return false; 391 return false;
392 } 392 }
393 393
394 void CastContentBrowserClient::RegisterInProcessMojoApplications( 394 void CastContentBrowserClient::RegisterInProcessMojoApplications(
395 StaticMojoApplicationMap* apps) { 395 StaticMojoApplicationMap* apps) {
396 #if defined(ENABLE_MOJO_MEDIA_IN_BROWSER_PROCESS) 396 #if defined(ENABLE_MOJO_MEDIA_IN_BROWSER_PROCESS)
397 apps->insert(std::make_pair( 397 content::MojoApplicationInfo app_info;
398 "mojo:media", 398 app_info.application_factory =
399 base::Bind(&CreateCastMojoMediaApplication, base::Unretained(this)))); 399 base::Bind(&CreateCastMojoMediaApplication, base::Unretained(this));
400 app_info.application_task_runner = GetMediaTaskRunner();
401 apps->insert(std::make_pair("mojo:media", app_info));
400 #endif 402 #endif
401 } 403 }
402 404
403 #if defined(OS_ANDROID) 405 #if defined(OS_ANDROID)
404 406
405 void CastContentBrowserClient::GetAdditionalMappedFilesForChildProcess( 407 void CastContentBrowserClient::GetAdditionalMappedFilesForChildProcess(
406 const base::CommandLine& command_line, 408 const base::CommandLine& command_line,
407 int child_process_id, 409 int child_process_id,
408 content::FileDescriptorInfo* mappings, 410 content::FileDescriptorInfo* mappings,
409 std::map<int, base::MemoryMappedFile::Region>* regions) { 411 std::map<int, base::MemoryMappedFile::Region>* regions) {
(...skipping 98 matching lines...) Expand 10 before | Expand all | Expand 10 after
508 process_type, dumps_path, false /* upload */); 510 process_type, dumps_path, false /* upload */);
509 // StartUploaderThread() even though upload is diferred. 511 // StartUploaderThread() even though upload is diferred.
510 // Breakpad-related memory is freed in the uploader thread. 512 // Breakpad-related memory is freed in the uploader thread.
511 crash_handler->StartUploaderThread(); 513 crash_handler->StartUploaderThread();
512 return crash_handler; 514 return crash_handler;
513 } 515 }
514 #endif // !defined(OS_ANDROID) 516 #endif // !defined(OS_ANDROID)
515 517
516 } // namespace shell 518 } // namespace shell
517 } // namespace chromecast 519 } // namespace chromecast
OLDNEW
« no previous file with comments | « chrome/browser/chrome_content_browser_client.cc ('k') | content/browser/mojo/mojo_shell_context.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698