media/mojo/services/mojo_cdm_promise.h - 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: media/mojo/services/mojo_cdm_promise.h

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

Index: media/mojo/services/mojo_cdm_promise.h

diff --git a/media/mojo/services/mojo_cdm_promise.h b/media/mojo/services/mojo_cdm_promise.h

index 8492f22fee7745ebbc1ca2351b99d8328f5b0109..5f0d80d5363b686d95a66ef9db10c194aed0d1b6 100644

--- a/media/mojo/services/mojo_cdm_promise.h

+++ b/media/mojo/services/mojo_cdm_promise.h

@@ -9,7 +9,7 @@

#include "media/base/cdm_promise.h"

#include "media/mojo/interfaces/content_decryption_module.mojom.h"

#include "media/mojo/services/mojo_type_trait.h"

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

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

namespace media {

« no previous file with comments | « media/mojo/services/mojo_cdm_factory.cc ('k') | media/mojo/services/mojo_cdm_service.h » ('j') | no next file with comments »