| OLD | NEW |
|---|
| 1 // Copyright (c) 2006-2009 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2006-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 #if defined(BROWSER_SYNC) | |
| 6 | |
| 7 #ifndef CHROME_BROWSER_SYNC_GLUE_MODEL_ASSOCIATOR_H_ | 5 #ifndef CHROME_BROWSER_SYNC_GLUE_MODEL_ASSOCIATOR_H_ |
| 8 #define CHROME_BROWSER_SYNC_GLUE_MODEL_ASSOCIATOR_H_ | 6 #define CHROME_BROWSER_SYNC_GLUE_MODEL_ASSOCIATOR_H_ |
| 9 | 7 |
| 10 #include <map> | 8 #include <map> |
| 11 #include <set> | 9 #include <set> |
| 12 #include <string> | 10 #include <string> |
| 13 | 11 |
| 14 #include "base/basictypes.h" | 12 #include "base/basictypes.h" |
| 15 #include "base/ref_counted.h" | 13 #include "base/ref_counted.h" |
| 16 #include "base/scoped_ptr.h" | 14 #include "base/scoped_ptr.h" |
| (...skipping 116 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 133 // Indicates whether there is already a pending task to persist dirty model | 131 // Indicates whether there is already a pending task to persist dirty model |
| 134 // associations. | 132 // associations. |
| 135 bool task_pending_; | 133 bool task_pending_; |
| 136 | 134 |
| 137 DISALLOW_COPY_AND_ASSIGN(ModelAssociator); | 135 DISALLOW_COPY_AND_ASSIGN(ModelAssociator); |
| 138 }; | 136 }; |
| 139 | 137 |
| 140 } // namespace browser_sync | 138 } // namespace browser_sync |
| 141 | 139 |
| 142 #endif // CHROME_BROWSER_SYNC_GLUE_MODEL_ASSOCIATOR_H_ | 140 #endif // CHROME_BROWSER_SYNC_GLUE_MODEL_ASSOCIATOR_H_ |
| 143 #endif // defined(BROWSER_SYNC) | |
| OLD | NEW |
|---|
Chromium Code Reviews
