chrome/browser/chrome_content_browser_client.cc - Issue 1128453004: Embed a simple Mojo shell in content

Unified Diff: chrome/browser/chrome_content_browser_client.cc

Issue 1128453004: Embed a simple Mojo shell in content (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/chrome_content_browser_client.h ('k') | chrome/browser/net/mojo_app_proxy_resolver_factory.h » ('j') | chrome/common/application_urls.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 75a40bc0b4da11f255ae6bafc66ba0d7be88cf76..249588ffd329535552a5a119c4749027fce303d1 100644

--- a/chrome/browser/chrome_content_browser_client.cc

+++ b/chrome/browser/chrome_content_browser_client.cc

@@ -78,6 +78,7 @@

#include "chrome/browser/ui/sync/sync_promo_ui.h"

#include "chrome/browser/ui/tab_contents/chrome_web_contents_view_delegate.h"

#include "chrome/browser/ui/webui/chrome_web_ui_controller_factory.h"

+#include "chrome/common/application_urls.h"

#include "chrome/common/chrome_constants.h"

#include "chrome/common/chrome_paths.h"

#include "chrome/common/chrome_switches.h"

@@ -100,6 +101,7 @@

#include "components/google/core/browser/google_util.h"

#include "components/metrics/client_info.h"

#include "components/pref_registry/pref_registry_syncable.h"

+#include "components/proxy_resolver/proxy_resolver_app.h"

#include "components/rappor/rappor_utils.h"

#include "components/signin/core/common/profile_management_switches.h"

#include "components/translate/core/common/translate_switches.h"

@@ -112,6 +114,7 @@

#include "content/public/browser/child_process_data.h"

#include "content/public/browser/child_process_security_policy.h"

#include "content/public/browser/client_certificate_delegate.h"

+#include "content/public/browser/mojo_shell_context.h"

#include "content/public/browser/render_frame_host.h"

#include "content/public/browser/render_process_host.h"

#include "content/public/browser/render_view_host.h"

@@ -132,6 +135,7 @@

#include "ui/base/l10n/l10n_util.h"

#include "ui/base/resource/resource_bundle.h"

#include "ui/resources/grit/ui_resources.h"

+#include "url/gurl.h"

#if defined(OS_WIN)

#include "base/win/windows_version.h"

@@ -2451,4 +2455,13 @@ void ChromeContentBrowserClient::MaybeCopyDisableWebRtcEncryptionSwitch(

}

#endif // defined(ENABLE_WEBRTC)

+void ChromeContentBrowserClient::ConfigureMojoShell(

+ content::MojoShellContext* context) {

+ if (base::CommandLine::ForCurrentProcess()->HasSwitch(

+ switches::kV8PacMojoInProcess)) {

xhwang 2015/05/13 04:36:20 For media, I am using a gyp/gn variable and a macr

+ context->AddInProcessStaticLoader<proxy_resolver::ProxyResolverApp>(

+ GURL(application_urls::kProxyResolver));

+ }

} // namespace chrome