| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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 "content/shell/browser/shell_content_browser_client.h" | 5 #include "content/shell/browser/shell_content_browser_client.h" |
| 6 | 6 |
| 7 #include <stddef.h> | 7 #include <stddef.h> |
| 8 #include <utility> | 8 #include <utility> |
| 9 | 9 |
| 10 #include "base/base_switches.h" | 10 #include "base/base_switches.h" |
| (...skipping 174 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 185 return true; | 185 return true; |
| 186 } | 186 } |
| 187 return false; | 187 return false; |
| 188 } | 188 } |
| 189 | 189 |
| 190 void ShellContentBrowserClient::RegisterInProcessMojoApplications( | 190 void ShellContentBrowserClient::RegisterInProcessMojoApplications( |
| 191 StaticMojoApplicationMap* apps) { | 191 StaticMojoApplicationMap* apps) { |
| 192 #if (ENABLE_MOJO_MEDIA_IN_BROWSER_PROCESS) | 192 #if (ENABLE_MOJO_MEDIA_IN_BROWSER_PROCESS) |
| 193 content::MojoApplicationInfo app_info; | 193 content::MojoApplicationInfo app_info; |
| 194 app_info.application_factory = base::Bind(&media::CreateMojoMediaApplication); | 194 app_info.application_factory = base::Bind(&media::CreateMojoMediaApplication); |
| 195 apps->insert(std::make_pair("mojo:media", app_info)); | 195 apps->insert(std::make_pair("service:media", app_info)); |
| 196 #endif | 196 #endif |
| 197 } | 197 } |
| 198 | 198 |
| 199 void ShellContentBrowserClient::RegisterOutOfProcessMojoApplications( | 199 void ShellContentBrowserClient::RegisterOutOfProcessMojoApplications( |
| 200 OutOfProcessMojoApplicationMap* apps) { | 200 OutOfProcessMojoApplicationMap* apps) { |
| 201 apps->insert(std::make_pair(kTestMojoAppUrl, | 201 apps->insert(std::make_pair(kTestMojoAppUrl, |
| 202 base::UTF8ToUTF16("Test Mojo App"))); | 202 base::UTF8ToUTF16("Test Mojo App"))); |
| 203 } | 203 } |
| 204 | 204 |
| 205 std::unique_ptr<base::Value> | 205 std::unique_ptr<base::Value> |
| (...skipping 166 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 372 ShellBrowserContext* ShellContentBrowserClient::browser_context() { | 372 ShellBrowserContext* ShellContentBrowserClient::browser_context() { |
| 373 return shell_browser_main_parts_->browser_context(); | 373 return shell_browser_main_parts_->browser_context(); |
| 374 } | 374 } |
| 375 | 375 |
| 376 ShellBrowserContext* | 376 ShellBrowserContext* |
| 377 ShellContentBrowserClient::off_the_record_browser_context() { | 377 ShellContentBrowserClient::off_the_record_browser_context() { |
| 378 return shell_browser_main_parts_->off_the_record_browser_context(); | 378 return shell_browser_main_parts_->off_the_record_browser_context(); |
| 379 } | 379 } |
| 380 | 380 |
| 381 } // namespace content | 381 } // namespace content |
| OLD | NEW |