content/browser/mojo/mojo_shell_context.cc - Issue 1410053006: Move third_party/mojo/src/mojo/public to mojo/public

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/browser/mojo/mojo_shell_context.cc

Issue 1410053006: Move third_party/mojo/src/mojo/public to mojo/public (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: merge Created 5 years, 1 month 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 | « content/browser/geolocation/geolocation_service_impl.h ('k') | content/browser/navigator_connect/service_port_service_impl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/mojo/mojo_shell_context.cc

diff --git a/content/browser/mojo/mojo_shell_context.cc b/content/browser/mojo/mojo_shell_context.cc

index e3596944c94add0fa90e606f6f3e06ba7407076c..57f14eabb85716b55546cc4bb4e987135eee9847 100644

--- a/content/browser/mojo/mojo_shell_context.cc

+++ b/content/browser/mojo/mojo_shell_context.cc

@@ -21,12 +21,12 @@

#include "mojo/application/public/cpp/application_delegate.h"

#include "mojo/common/url_type_converters.h"

#include "mojo/package_manager/package_manager_impl.h"

+#include "mojo/public/cpp/bindings/interface_request.h"

+#include "mojo/public/cpp/bindings/string.h"

#include "mojo/shell/application_loader.h"

#include "mojo/shell/connect_to_application_params.h"

#include "mojo/shell/identity.h"

#include "mojo/shell/static_application_loader.h"

-#include "third_party/mojo/src/mojo/public/cpp/bindings/interface_request.h"

-#include "third_party/mojo/src/mojo/public/cpp/bindings/string.h"

#if defined(ENABLE_MOJO_MEDIA_IN_BROWSER_PROCESS) || \

defined(ENABLE_MOJO_MEDIA_IN_GPU_PROCESS)