| OLD | NEW |
| 1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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 #ifndef CHROME_BROWSER_SYNC_UTIL_USER_SETTINGS_H_ | 5 #ifndef CHROME_BROWSER_SYNC_UTIL_USER_SETTINGS_H_ |
| 6 #define CHROME_BROWSER_SYNC_UTIL_USER_SETTINGS_H_ | 6 #define CHROME_BROWSER_SYNC_UTIL_USER_SETTINGS_H_ |
| 7 #pragma once | 7 #pragma once |
| 8 | 8 |
| 9 #include <map> | 9 #include <map> |
| 10 #include <set> | |
| 11 #include <string> | 10 #include <string> |
| 12 | 11 |
| 13 #include "base/file_path.h" | 12 #include "base/file_path.h" |
| 14 #include "base/lock.h" | 13 #include "base/lock.h" |
| 15 #include "build/build_config.h" | 14 #include "build/build_config.h" |
| 16 | 15 |
| 17 extern "C" struct sqlite3; | 16 extern "C" struct sqlite3; |
| 18 | 17 |
| 19 namespace browser_sync { | 18 namespace browser_sync { |
| 20 | 19 |
| (...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 103 typedef std::map<std::string, std::string> ServiceTokenMap; | 102 typedef std::map<std::string, std::string> ServiceTokenMap; |
| 104 ServiceTokenMap service_tokens_; | 103 ServiceTokenMap service_tokens_; |
| 105 #endif // OS_WIN | 104 #endif // OS_WIN |
| 106 | 105 |
| 107 DISALLOW_COPY_AND_ASSIGN(UserSettings); | 106 DISALLOW_COPY_AND_ASSIGN(UserSettings); |
| 108 }; | 107 }; |
| 109 | 108 |
| 110 } // namespace browser_sync | 109 } // namespace browser_sync |
| 111 | 110 |
| 112 #endif // CHROME_BROWSER_SYNC_UTIL_USER_SETTINGS_H_ | 111 #endif // CHROME_BROWSER_SYNC_UTIL_USER_SETTINGS_H_ |
| OLD | NEW |