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

Unified Diff: mojo/edk/system/slave_connection_manager.h

Issue 1483823004: EDK: Move {platform_handle,scoped_platform_handle}.* to //mojo/edk/platform. (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: 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 | « mojo/edk/system/shared_buffer_dispatcher.cc ('k') | mojo/edk/system/slave_connection_manager.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/edk/system/slave_connection_manager.h
diff --git a/mojo/edk/system/slave_connection_manager.h b/mojo/edk/system/slave_connection_manager.h
index 951f1e1a52c095fd5e896218516d2ab3e87702fb..8b3b7b23939c0d6493639dc74493051b0bfaa816 100644
--- a/mojo/edk/system/slave_connection_manager.h
+++ b/mojo/edk/system/slave_connection_manager.h
@@ -8,8 +8,8 @@
#include <memory>
#include "base/threading/thread.h"
-#include "mojo/edk/embedder/scoped_platform_handle.h"
#include "mojo/edk/embedder/slave_process_delegate.h"
+#include "mojo/edk/platform/scoped_platform_handle.h"
#include "mojo/edk/platform/task_runner.h"
#include "mojo/edk/system/connection_manager.h"
#include "mojo/edk/system/raw_channel.h"
@@ -52,7 +52,7 @@ class SlaveConnectionManager final : public ConnectionManager,
// must stay alive at least until after |Shutdown()| has been called.
void Init(util::RefPtr<platform::TaskRunner>&& delegate_thread_task_runner,
embedder::SlaveProcessDelegate* slave_process_delegate,
- embedder::ScopedPlatformHandle platform_handle);
+ platform::ScopedPlatformHandle platform_handle);
// |ConnectionManager| methods:
void Shutdown() override;
@@ -61,11 +61,11 @@ class SlaveConnectionManager final : public ConnectionManager,
Result Connect(const ConnectionIdentifier& connection_id,
ProcessIdentifier* peer_process_identifier,
bool* is_first,
- embedder::ScopedPlatformHandle* platform_handle) override;
+ platform::ScopedPlatformHandle* platform_handle) override;
private:
// These should only be called on |private_thread_|:
- void InitOnPrivateThread(embedder::ScopedPlatformHandle platform_handle);
+ void InitOnPrivateThread(platform::ScopedPlatformHandle platform_handle);
void ShutdownOnPrivateThread();
void AllowConnectOnPrivateThread(const ConnectionIdentifier& connection_id,
Result* result);
@@ -75,12 +75,12 @@ class SlaveConnectionManager final : public ConnectionManager,
Result* result,
ProcessIdentifier* peer_process_identifier,
bool* is_first,
- embedder::ScopedPlatformHandle* platform_handle);
+ platform::ScopedPlatformHandle* platform_handle);
// |RawChannel::Delegate| methods (only called on |private_thread_|):
void OnReadMessage(
const MessageInTransit::View& message_view,
- std::unique_ptr<std::vector<embedder::ScopedPlatformHandle>>
+ std::unique_ptr<std::vector<platform::ScopedPlatformHandle>>
platform_handles) override;
void OnError(Error error) override;
@@ -119,7 +119,7 @@ class SlaveConnectionManager final : public ConnectionManager,
// Used only when waiting for the ack to "connect":
ProcessIdentifier* ack_peer_process_identifier_;
bool* ack_is_first_;
- embedder::ScopedPlatformHandle* ack_platform_handle_;
+ platform::ScopedPlatformHandle* ack_platform_handle_;
// The (synchronous) |ConnectionManager| methods are implemented in the
// following way (T is any thread other than |private_thread_|):
« no previous file with comments | « mojo/edk/system/shared_buffer_dispatcher.cc ('k') | mojo/edk/system/slave_connection_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698