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

Side by Side Diff: content/child/npapi/np_channel_base.cc

Issue 1544273002: Switch to standard integer types in content/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 12 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 unified diff | Download patch
« no previous file with comments | « content/child/npapi/np_channel_base.h ('k') | content/child/npapi/npobject_proxy.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/child/npapi/np_channel_base.h" 5 #include "content/child/npapi/np_channel_base.h"
6 6
7 #include <stddef.h>
8
7 #include "base/auto_reset.h" 9 #include "base/auto_reset.h"
8 #include "base/containers/hash_tables.h" 10 #include "base/containers/hash_tables.h"
9 #include "base/files/scoped_file.h" 11 #include "base/files/scoped_file.h"
10 #include "base/lazy_instance.h" 12 #include "base/lazy_instance.h"
11 #include "base/single_thread_task_runner.h" 13 #include "base/single_thread_task_runner.h"
12 #include "base/strings/string_number_conversions.h" 14 #include "base/strings/string_number_conversions.h"
13 #include "base/threading/thread_local.h" 15 #include "base/threading/thread_local.h"
16 #include "build/build_config.h"
14 #include "ipc/ipc_sync_message.h" 17 #include "ipc/ipc_sync_message.h"
15 18
16 #if defined(OS_POSIX) 19 #if defined(OS_POSIX)
17 #include "base/files/file_util.h" 20 #include "base/files/file_util.h"
18 #include "ipc/ipc_channel_posix.h" 21 #include "ipc/ipc_channel_posix.h"
19 #endif 22 #endif
20 23
21 namespace content { 24 namespace content {
22 25
23 namespace { 26 namespace {
(...skipping 214 matching lines...) Expand 10 before | Expand all | Expand 10 after
238 reply->set_reply_error(); 241 reply->set_reply_error();
239 Send(reply); 242 Send(reply);
240 } 243 }
241 } 244 }
242 if (message.should_unblock()) 245 if (message.should_unblock())
243 in_unblock_dispatch_--; 246 in_unblock_dispatch_--;
244 247
245 return handled; 248 return handled;
246 } 249 }
247 250
248 void NPChannelBase::OnChannelConnected(int32 peer_pid) { 251 void NPChannelBase::OnChannelConnected(int32_t peer_pid) {
249 peer_pid_ = peer_pid; 252 peer_pid_ = peer_pid;
250 } 253 }
251 254
252 void NPChannelBase::AddRoute(int route_id, 255 void NPChannelBase::AddRoute(int route_id,
253 IPC::Listener* listener, 256 IPC::Listener* listener,
254 NPObjectBase* npobject) { 257 NPObjectBase* npobject) {
255 if (npobject) { 258 if (npobject) {
256 npobject_listeners_[route_id] = npobject; 259 npobject_listeners_[route_id] = npobject;
257 } else { 260 } else {
258 non_npobject_count_++; 261 non_npobject_count_++;
(...skipping 122 matching lines...) Expand 10 before | Expand all | Expand 10 after
381 RouteToOwnerMap::iterator iter = route_to_owner_.find(route_id); 384 RouteToOwnerMap::iterator iter = route_to_owner_.find(route_id);
382 return iter != route_to_owner_.end() ? iter->second : default_owner_; 385 return iter != route_to_owner_.end() ? iter->second : default_owner_;
383 } 386 }
384 387
385 int NPChannelBase::GetExistingRouteForNPObjectOwner(NPP owner) { 388 int NPChannelBase::GetExistingRouteForNPObjectOwner(NPP owner) {
386 OwnerToRouteMap::iterator iter = owner_to_route_.find(owner); 389 OwnerToRouteMap::iterator iter = owner_to_route_.find(owner);
387 return iter != owner_to_route_.end() ? iter->second : MSG_ROUTING_NONE; 390 return iter != owner_to_route_.end() ? iter->second : MSG_ROUTING_NONE;
388 } 391 }
389 392
390 } // namespace content 393 } // namespace content
OLDNEW
« no previous file with comments | « content/child/npapi/np_channel_base.h ('k') | content/child/npapi/npobject_proxy.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698