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

Unified Diff: third_party/mojo/src/mojo/edk/embedder/slave_process_delegate.h

Issue 954643002: Update mojo sdk to rev 3d23dae011859a2aae49f1d1adde705c8e85d819 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: use run_renderer_in_process() Created 5 years, 10 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
Index: third_party/mojo/src/mojo/edk/embedder/slave_process_delegate.h
diff --git a/third_party/mojo/src/mojo/edk/embedder/slave_process_delegate.h b/third_party/mojo/src/mojo/edk/embedder/slave_process_delegate.h
index 1c55a7a302a36abc3f376515ebdee156a572f1ab..d9592154161b665b3f45b3f078347f60a3093f01 100644
--- a/third_party/mojo/src/mojo/edk/embedder/slave_process_delegate.h
+++ b/third_party/mojo/src/mojo/edk/embedder/slave_process_delegate.h
@@ -7,6 +7,7 @@
#include "base/macros.h"
#include "base/memory/scoped_ptr.h"
+#include "mojo/edk/embedder/process_delegate.h"
#include "mojo/edk/system/system_impl_export.h"
namespace mojo {
@@ -14,8 +15,10 @@ namespace embedder {
// An interface for the slave process delegate (which lives in each slave
// process).
-class MOJO_SYSTEM_IMPL_EXPORT SlaveProcessDelegate {
+class MOJO_SYSTEM_IMPL_EXPORT SlaveProcessDelegate : public ProcessDelegate {
public:
+ ProcessType GetType() const override;
+
// Called when contact with the master process has been lost.
// TODO(vtl): Obviously, there needs to be a suitable embedder API for
// connecting to the master process. What will it be? Mention that here once
@@ -24,12 +27,16 @@ class MOJO_SYSTEM_IMPL_EXPORT SlaveProcessDelegate {
protected:
SlaveProcessDelegate() {}
- virtual ~SlaveProcessDelegate() {}
+ ~SlaveProcessDelegate() override {}
private:
DISALLOW_COPY_AND_ASSIGN(SlaveProcessDelegate);
};
+inline ProcessType SlaveProcessDelegate::GetType() const {
+ return ProcessType::SLAVE;
+}
+
} // namespace embedder
} // namespace mojo

Powered by Google App Engine
This is Rietveld 408576698