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

Unified Diff: content/renderer/pepper/ppb_broker_impl.cc

Issue 316373003: Remove base::kInvalidPlatformFileValue from Content (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 6 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/renderer/pepper/pepper_broker.cc ('k') | content/shell/app/shell_main_delegate.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/pepper/ppb_broker_impl.cc
diff --git a/content/renderer/pepper/ppb_broker_impl.cc b/content/renderer/pepper/ppb_broker_impl.cc
index 00378773d7eee813f88da8568acf405df77ef615..f75d56c53d48fb9146b2b6852b8e3be5b8f33740 100644
--- a/content/renderer/pepper/ppb_broker_impl.cc
+++ b/content/renderer/pepper/ppb_broker_impl.cc
@@ -31,7 +31,7 @@ PPB_Broker_Impl::PPB_Broker_Impl(PP_Instance instance)
: Resource(ppapi::OBJECT_IS_IMPL, instance),
broker_(NULL),
connect_callback_(),
- pipe_handle_(PlatformFileToInt(base::kInvalidPlatformFileValue)),
+ pipe_handle_(PlatformFileToInt(base::SyncSocket::kInvalidHandle)),
routing_id_(RenderThreadImpl::current()->GenerateRoutingID()) {
ChildThread::current()->GetRouter()->AddRoute(routing_id_, this);
}
@@ -43,7 +43,7 @@ PPB_Broker_Impl::~PPB_Broker_Impl() {
}
// The plugin owns the handle.
- pipe_handle_ = PlatformFileToInt(base::kInvalidPlatformFileValue);
+ pipe_handle_ = PlatformFileToInt(base::SyncSocket::kInvalidHandle);
ChildThread::current()->GetRouter()->RemoveRoute(routing_id_);
}
@@ -95,7 +95,7 @@ int32_t PPB_Broker_Impl::Connect(
}
int32_t PPB_Broker_Impl::GetHandle(int32_t* handle) {
- if (pipe_handle_ == PlatformFileToInt(base::kInvalidPlatformFileValue))
+ if (pipe_handle_ == PlatformFileToInt(base::SyncSocket::kInvalidHandle))
return PP_ERROR_FAILED; // Handle not set yet.
*handle = pipe_handle_;
return PP_OK;
@@ -109,9 +109,9 @@ GURL PPB_Broker_Impl::GetDocumentUrl() {
// Transfers ownership of the handle to the plugin.
void PPB_Broker_Impl::BrokerConnected(int32_t handle, int32_t result) {
- DCHECK(pipe_handle_ == PlatformFileToInt(base::kInvalidPlatformFileValue));
+ DCHECK(pipe_handle_ == PlatformFileToInt(base::SyncSocket::kInvalidHandle));
DCHECK(result == PP_OK ||
- handle == PlatformFileToInt(base::kInvalidPlatformFileValue));
+ handle == PlatformFileToInt(base::SyncSocket::kInvalidHandle));
pipe_handle_ = handle;
« no previous file with comments | « content/renderer/pepper/pepper_broker.cc ('k') | content/shell/app/shell_main_delegate.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698