Index: chrome/browser/chrome_content_browser_client.cc |
diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc |
index a98e46b7abc84b1c1f2e72aa4f424e5dd15783d3..36ec0b71710f2aa4d90eec698c69e6d9f3d2f624 100644 |
--- a/chrome/browser/chrome_content_browser_client.cc |
+++ b/chrome/browser/chrome_content_browser_client.cc |
@@ -102,6 +102,7 @@ |
#include "chrome/common/pref_names.h" |
#include "chrome/common/render_messages.h" |
#include "chrome/common/url_constants.h" |
+#include "chrome/grit/browser_resources.h" |
#include "chrome/grit/generated_resources.h" |
#include "chrome/installer/util/google_update_settings.h" |
#include "chromeos/chromeos_constants.h" |
@@ -2782,6 +2783,42 @@ bool ChromeContentBrowserClient::ShouldUseWindowsPrefetchArgument() const { |
} |
#endif // defined(OS_WIN) |
+std::string ChromeContentBrowserClient::GetPackagedMojoApplicationName() { |
+ return "exe:chrome"; |
+} |
+ |
+std::string ChromeContentBrowserClient::GetMojoApplicationNameForProcess( |
+ content::ProcessType type) { |
+ switch (type) { |
+ case content::PROCESS_TYPE_RENDERER: |
+ return "exe:chrome_renderer"; |
+ |
+ default: |
+ return std::string(); |
+ } |
+} |
+ |
+bool ChromeContentBrowserClient::GetMojoApplicationManifest( |
+ const base::StringPiece& name, |
+ std::string* manifest_contents) { |
+ ResourceBundle& rb = ResourceBundle::GetSharedInstance(); |
+ if (name == "exe:chrome") { |
+ *manifest_contents = |
+ rb.GetRawDataResource(IDR_MOJO_CHROME_MANIFEST).as_string(); |
+ return true; |
+ } else if (name == "exe:chrome_renderer") { |
+ *manifest_contents = |
+ rb.GetRawDataResource(IDR_MOJO_CHROME_RENDERER_MANIFEST).as_string(); |
+ return true; |
+ } else if (name == "mojo:catalog") { |
+ *manifest_contents = |
+ rb.GetRawDataResource(IDR_MOJO_CATALOG_MANIFEST).as_string(); |
+ return true; |
+ } |
+ |
+ return false; |
+} |
+ |
void ChromeContentBrowserClient::RegisterFrameMojoShellServices( |
content::ServiceRegistry* registry, |
content::RenderFrameHost* render_frame_host) { |