| OLD | NEW |
|---|
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright 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 "sync/syncable/base_transaction.h" | 5 #include "sync/syncable/syncable_base_transaction.h" |
| 6 | 6 |
| 7 #include "base/debug/trace_event.h" | 7 #include "base/debug/trace_event.h" |
| 8 #include "sync/syncable/directory.h" | 8 #include "sync/syncable/directory.h" |
| 9 | 9 |
| 10 namespace syncer { | 10 namespace syncer { |
| 11 namespace syncable { | 11 namespace syncable { |
| 12 | 12 |
| 13 void BaseTransaction::Lock() { | 13 void BaseTransaction::Lock() { |
| 14 TRACE_EVENT2("sync_lock_contention", "AcquireLock", | 14 TRACE_EVENT2("sync_lock_contention", "AcquireLock", |
| 15 "src_file", from_here_.file_name(), | 15 "src_file", from_here_.file_name(), |
| (...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 61 "src_file", from_here_.file_name(), | 61 "src_file", from_here_.file_name(), |
| 62 "src_func", from_here_.function_name()); | 62 "src_func", from_here_.function_name()); |
| 63 } | 63 } |
| 64 | 64 |
| 65 BaseTransaction::~BaseTransaction() { | 65 BaseTransaction::~BaseTransaction() { |
| 66 TRACE_EVENT_END0("sync", name_); | 66 TRACE_EVENT_END0("sync", name_); |
| 67 } | 67 } |
| 68 | 68 |
| 69 } // namespace syncable | 69 } // namespace syncable |
| 70 } // namespace syncer | 70 } // namespace syncer |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 11638018:
[sync] Componentize sync: Part 5: Eliminate filename collisions in sync.gyp (Closed)
Base URL: svn://svn.chromium.org/chrome/trunk/src