| OLD | NEW |
| 1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2009 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 // This used to do a lot of TLS-based management of multiple Directory objects. | 5 // This used to do a lot of TLS-based management of multiple Directory objects. |
| 6 // We now can access Directory objects from any thread for general purpose | 6 // We now can access Directory objects from any thread for general purpose |
| 7 // operations and we only ever have one Directory, so this class isn't doing | 7 // operations and we only ever have one Directory, so this class isn't doing |
| 8 // anything too fancy besides keeping calling and access conventions the same | 8 // anything too fancy besides keeping calling and access conventions the same |
| 9 // for now. | 9 // for now. |
| 10 // TODO(timsteele): We can probably nuke this entire class and use raw | 10 // TODO(timsteele): We can probably nuke this entire class and use raw |
| 11 // Directory objects everywhere. | 11 // Directory objects everywhere. |
| 12 #ifndef CHROME_BROWSER_SYNC_SYNCABLE_DIRECTORY_MANAGER_H_ | 12 #ifndef CHROME_BROWSER_SYNC_SYNCABLE_DIRECTORY_MANAGER_H_ |
| 13 #define CHROME_BROWSER_SYNC_SYNCABLE_DIRECTORY_MANAGER_H_ | 13 #define CHROME_BROWSER_SYNC_SYNCABLE_DIRECTORY_MANAGER_H_ |
| 14 #pragma once | 14 #pragma once |
| 15 | 15 |
| 16 #include <string> | 16 #include <string> |
| 17 #include <vector> | 17 #include <vector> |
| 18 | 18 |
| 19 #include "base/atomicops.h" | |
| 20 #include "base/basictypes.h" | 19 #include "base/basictypes.h" |
| 21 #include "base/file_path.h" | 20 #include "base/file_path.h" |
| 22 #include "base/lock.h" | 21 #include "base/lock.h" |
| 23 #include "chrome/browser/sync/syncable/dir_open_result.h" | 22 #include "chrome/browser/sync/syncable/dir_open_result.h" |
| 24 #include "chrome/browser/sync/syncable/path_name_cmp.h" | 23 #include "chrome/browser/sync/syncable/path_name_cmp.h" |
| 25 #include "chrome/browser/sync/syncable/syncable.h" | 24 #include "chrome/browser/sync/syncable/syncable.h" |
| 26 #include "chrome/browser/sync/util/cryptographer.h" | 25 #include "chrome/browser/sync/util/cryptographer.h" |
| 27 #include "chrome/browser/sync/util/sync_types.h" | 26 #include "chrome/browser/sync/util/sync_types.h" |
| 28 #include "chrome/common/deprecated/event_sys.h" | 27 #include "chrome/common/deprecated/event_sys.h" |
| 29 | 28 |
| (...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 124 bool good_; | 123 bool good_; |
| 125 // Ensure that the programmer checks good before using the ScopedDirLookup. | 124 // Ensure that the programmer checks good before using the ScopedDirLookup. |
| 126 // This member should can be removed if it ever shows up in profiling | 125 // This member should can be removed if it ever shows up in profiling |
| 127 bool good_checked_; | 126 bool good_checked_; |
| 128 DirectoryManager* const dirman_; | 127 DirectoryManager* const dirman_; |
| 129 }; | 128 }; |
| 130 | 129 |
| 131 } // namespace syncable | 130 } // namespace syncable |
| 132 | 131 |
| 133 #endif // CHROME_BROWSER_SYNC_SYNCABLE_DIRECTORY_MANAGER_H_ | 132 #endif // CHROME_BROWSER_SYNC_SYNCABLE_DIRECTORY_MANAGER_H_ |
| OLD | NEW |