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

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

Issue 2390013002: Rename mojo: to service: (Closed)
Patch Set: . Created 4 years, 2 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
« no previous file with comments | « chrome/test/base/mash_browser_tests_main.cc ('k') | components/filesystem/files_test_base.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 413 matching lines...) Expand 10 before | Expand all | Expand 10 after
424 base::ThreadTaskRunnerHandle::Get()); 424 base::ThreadTaskRunnerHandle::Get());
425 } 425 }
426 426
427 void CastContentBrowserClient::RegisterInProcessMojoApplications( 427 void CastContentBrowserClient::RegisterInProcessMojoApplications(
428 StaticMojoApplicationMap* apps) { 428 StaticMojoApplicationMap* apps) {
429 #if defined(ENABLE_MOJO_MEDIA_IN_BROWSER_PROCESS) 429 #if defined(ENABLE_MOJO_MEDIA_IN_BROWSER_PROCESS)
430 content::MojoApplicationInfo app_info; 430 content::MojoApplicationInfo app_info;
431 app_info.application_factory = 431 app_info.application_factory =
432 base::Bind(&CreateMojoMediaApplication, base::Unretained(this)); 432 base::Bind(&CreateMojoMediaApplication, base::Unretained(this));
433 app_info.application_task_runner = GetMediaTaskRunner(); 433 app_info.application_task_runner = GetMediaTaskRunner();
434 apps->insert(std::make_pair("mojo:media", app_info)); 434 apps->insert(std::make_pair("service:media", app_info));
435 #endif 435 #endif
436 } 436 }
437 437
438 std::unique_ptr<base::Value> 438 std::unique_ptr<base::Value>
439 CastContentBrowserClient::GetServiceManifestOverlay( 439 CastContentBrowserClient::GetServiceManifestOverlay(
440 const std::string& service_name) { 440 const std::string& service_name) {
441 ResourceBundle& rb = ResourceBundle::GetSharedInstance(); 441 ResourceBundle& rb = ResourceBundle::GetSharedInstance();
442 if (service_name != content::kBrowserMojoApplicationName) 442 if (service_name != content::kBrowserMojoApplicationName)
443 return nullptr; 443 return nullptr;
444 base::StringPiece manifest_contents = 444 base::StringPiece manifest_contents =
(...skipping 104 matching lines...) Expand 10 before | Expand all | Expand 10 after
549 process_type, dumps_path, false /* upload */); 549 process_type, dumps_path, false /* upload */);
550 // StartUploaderThread() even though upload is diferred. 550 // StartUploaderThread() even though upload is diferred.
551 // Breakpad-related memory is freed in the uploader thread. 551 // Breakpad-related memory is freed in the uploader thread.
552 crash_handler->StartUploaderThread(); 552 crash_handler->StartUploaderThread();
553 return crash_handler; 553 return crash_handler;
554 } 554 }
555 #endif // !defined(OS_ANDROID) 555 #endif // !defined(OS_ANDROID)
556 556
557 } // namespace shell 557 } // namespace shell
558 } // namespace chromecast 558 } // namespace chromecast
OLDNEW
« no previous file with comments | « chrome/test/base/mash_browser_tests_main.cc ('k') | components/filesystem/files_test_base.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698