| OLD | NEW |
|---|
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 "base/tracked_objects.h" | 5 #include "base/tracked_objects.h" |
| 6 | 6 |
| 7 #include <math.h> | 7 #include <math.h> |
| 8 #include <stdlib.h> | 8 #include <stdlib.h> |
| 9 | 9 |
| 10 #include "base/format_macros.h" | 10 #include "base/format_macros.h" |
| (...skipping 850 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 861 child(*parent_child.second) { | 861 child(*parent_child.second) { |
| 862 } | 862 } |
| 863 | 863 |
| 864 ParentChildPairSnapshot::~ParentChildPairSnapshot() { | 864 ParentChildPairSnapshot::~ParentChildPairSnapshot() { |
| 865 } | 865 } |
| 866 | 866 |
| 867 //------------------------------------------------------------------------------ | 867 //------------------------------------------------------------------------------ |
| 868 // ProcessDataSnapshot | 868 // ProcessDataSnapshot |
| 869 | 869 |
| 870 ProcessDataSnapshot::ProcessDataSnapshot() | 870 ProcessDataSnapshot::ProcessDataSnapshot() |
| 871 #if !defined(OS_NACL) |
| 871 : process_id(base::GetCurrentProcId()) { | 872 : process_id(base::GetCurrentProcId()) { |
| 873 #else |
| 874 : process_id(0) { |
| 875 #endif |
| 872 } | 876 } |
| 873 | 877 |
| 874 ProcessDataSnapshot::~ProcessDataSnapshot() { | 878 ProcessDataSnapshot::~ProcessDataSnapshot() { |
| 875 } | 879 } |
| 876 | 880 |
| 877 } // namespace tracked_objects | 881 } // namespace tracked_objects |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 10167024:
Add ipc_channel_nacl to the untrusted build and fix all compile/link errors. (Closed)
Base URL: svn://svn.chromium.org/chrome/trunk/src/