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/basictypes.h" | 19 #include "base/basictypes.h" |
20 #include "base/file_path.h" | 20 #include "base/file_path.h" |
21 #include "base/lock.h" | 21 #include "base/synchronization/lock.h" |
22 #include "chrome/browser/sync/syncable/dir_open_result.h" | 22 #include "chrome/browser/sync/syncable/dir_open_result.h" |
23 #include "chrome/browser/sync/syncable/path_name_cmp.h" | 23 #include "chrome/browser/sync/syncable/path_name_cmp.h" |
24 #include "chrome/browser/sync/syncable/syncable.h" | 24 #include "chrome/browser/sync/syncable/syncable.h" |
25 #include "chrome/browser/sync/util/cryptographer.h" | 25 #include "chrome/browser/sync/util/cryptographer.h" |
26 #include "chrome/common/deprecated/event_sys.h" | 26 #include "chrome/common/deprecated/event_sys.h" |
27 | 27 |
28 namespace sync_api { class BaseTransaction; } | 28 namespace sync_api { class BaseTransaction; } |
29 | 29 |
30 namespace syncable { | 30 namespace syncable { |
31 | 31 |
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
80 protected: | 80 protected: |
81 DirOpenResult OpenImpl(const std::string& name, const FilePath& path, | 81 DirOpenResult OpenImpl(const std::string& name, const FilePath& path, |
82 bool* was_open); | 82 bool* was_open); |
83 | 83 |
84 // Helpers for friend class ScopedDirLookup: | 84 // Helpers for friend class ScopedDirLookup: |
85 friend class ScopedDirLookup; | 85 friend class ScopedDirLookup; |
86 | 86 |
87 const FilePath root_path_; | 87 const FilePath root_path_; |
88 | 88 |
89 // protects managed_directory_ | 89 // protects managed_directory_ |
90 Lock lock_; | 90 base::Lock lock_; |
91 Directory* managed_directory_; | 91 Directory* managed_directory_; |
92 | 92 |
93 Channel* const channel_; | 93 Channel* const channel_; |
94 | 94 |
95 scoped_ptr<browser_sync::Cryptographer> cryptographer_; | 95 scoped_ptr<browser_sync::Cryptographer> cryptographer_; |
96 | 96 |
97 private: | 97 private: |
98 DISALLOW_COPY_AND_ASSIGN(DirectoryManager); | 98 DISALLOW_COPY_AND_ASSIGN(DirectoryManager); |
99 }; | 99 }; |
100 | 100 |
(...skipping 18 matching lines...) Expand all Loading... |
119 bool good_; | 119 bool good_; |
120 // Ensure that the programmer checks good before using the ScopedDirLookup. | 120 // Ensure that the programmer checks good before using the ScopedDirLookup. |
121 // This member should can be removed if it ever shows up in profiling | 121 // This member should can be removed if it ever shows up in profiling |
122 bool good_checked_; | 122 bool good_checked_; |
123 DirectoryManager* const dirman_; | 123 DirectoryManager* const dirman_; |
124 }; | 124 }; |
125 | 125 |
126 } // namespace syncable | 126 } // namespace syncable |
127 | 127 |
128 #endif // CHROME_BROWSER_SYNC_SYNCABLE_DIRECTORY_MANAGER_H_ | 128 #endif // CHROME_BROWSER_SYNC_SYNCABLE_DIRECTORY_MANAGER_H_ |
OLD | NEW |