Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(517)

Unified Diff: content/browser/mojo/mojo_application_host.h

Issue 1554443003: Stop linking in the old Mojo EDK. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: merge and fix new flaky test Created 4 years, 11 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 | « content/browser/gpu/gpu_arc_video_service_host.cc ('k') | content/browser/mojo/mojo_application_host.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/mojo/mojo_application_host.h
diff --git a/content/browser/mojo/mojo_application_host.h b/content/browser/mojo/mojo_application_host.h
index 0ed8ec917badba1d855bb304250dea5478ff10f1..13fb0e88c54f8b70f6e6732c5fbdadf95d4b7884 100644
--- a/content/browser/mojo/mojo_application_host.h
+++ b/content/browser/mojo/mojo_application_host.h
@@ -12,7 +12,7 @@
#include "content/common/application_setup.mojom.h"
#include "content/common/mojo/channel_init.h"
#include "content/common/mojo/service_registry_impl.h"
-#include "third_party/mojo/src/mojo/edk/embedder/scoped_platform_handle.h"
+#include "mojo/edk/embedder/scoped_platform_handle.h"
#if defined(OS_ANDROID)
#include "content/browser/mojo/service_registry_android.h"
@@ -40,8 +40,6 @@ class CONTENT_EXPORT MojoApplicationHost {
bool Init();
void Activate(IPC::Sender* sender, base::ProcessHandle process_handle);
- void WillDestroySoon();
-
ServiceRegistry* service_registry() { return &service_registry_; }
#if defined(OS_ANDROID)
@@ -55,7 +53,7 @@ class CONTENT_EXPORT MojoApplicationHost {
private:
ChannelInit channel_init_;
- mojo::embedder::ScopedPlatformHandle client_handle_;
+ mojo::edk::ScopedPlatformHandle client_handle_;
bool did_activate_;
« no previous file with comments | « content/browser/gpu/gpu_arc_video_service_host.cc ('k') | content/browser/mojo/mojo_application_host.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698