| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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_PROFILE_SYNC_SERVICE_H_ | 5 #ifndef CHROME_BROWSER_SYNC_PROFILE_SYNC_SERVICE_H_ |
| 6 #define CHROME_BROWSER_SYNC_PROFILE_SYNC_SERVICE_H_ | 6 #define CHROME_BROWSER_SYNC_PROFILE_SYNC_SERVICE_H_ |
| 7 #pragma once | 7 #pragma once |
| 8 | 8 |
| 9 #include <list> | 9 #include <list> |
| 10 #include <string> | 10 #include <string> |
| (...skipping 353 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 364 const tracked_objects::Location& from_here, | 364 const tracked_objects::Location& from_here, |
| 365 const std::string& message) OVERRIDE; | 365 const std::string& message) OVERRIDE; |
| 366 | 366 |
| 367 // The functions below (until ActivateDataType()) should only be | 367 // The functions below (until ActivateDataType()) should only be |
| 368 // called if sync_initialized() is true. | 368 // called if sync_initialized() is true. |
| 369 | 369 |
| 370 // TODO(akalin): This is called mostly by ModelAssociators and | 370 // TODO(akalin): This is called mostly by ModelAssociators and |
| 371 // tests. Figure out how to pass the handle to the ModelAssociators | 371 // tests. Figure out how to pass the handle to the ModelAssociators |
| 372 // directly, figure out how to expose this to tests, and remove this | 372 // directly, figure out how to expose this to tests, and remove this |
| 373 // function. | 373 // function. |
| 374 sync_api::UserShare* GetUserShare() const; | 374 virtual sync_api::UserShare* GetUserShare() const; |
| 375 | 375 |
| 376 // TODO(akalin): These two functions are used only by | 376 // TODO(akalin): These two functions are used only by |
| 377 // ProfileSyncServiceHarness. Figure out a different way to expose | 377 // ProfileSyncServiceHarness. Figure out a different way to expose |
| 378 // this info to that class, and remove these functions. | 378 // this info to that class, and remove these functions. |
| 379 | 379 |
| 380 virtual const browser_sync::sessions::SyncSessionSnapshot* | 380 virtual const browser_sync::sessions::SyncSessionSnapshot* |
| 381 GetLastSessionSnapshot() const; | 381 GetLastSessionSnapshot() const; |
| 382 | 382 |
| 383 // Returns whether or not the underlying sync engine has made any | 383 // Returns whether or not the underlying sync engine has made any |
| 384 // local changes to items that have not yet been synced with the | 384 // local changes to items that have not yet been synced with the |
| (...skipping 319 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 704 FailedDatatypesHandler failed_datatypes_handler_; | 704 FailedDatatypesHandler failed_datatypes_handler_; |
| 705 | 705 |
| 706 DISALLOW_COPY_AND_ASSIGN(ProfileSyncService); | 706 DISALLOW_COPY_AND_ASSIGN(ProfileSyncService); |
| 707 }; | 707 }; |
| 708 | 708 |
| 709 bool ShouldShowActionOnUI( | 709 bool ShouldShowActionOnUI( |
| 710 const browser_sync::SyncProtocolError& error); | 710 const browser_sync::SyncProtocolError& error); |
| 711 | 711 |
| 712 | 712 |
| 713 #endif // CHROME_BROWSER_SYNC_PROFILE_SYNC_SERVICE_H_ | 713 #endif // CHROME_BROWSER_SYNC_PROFILE_SYNC_SERVICE_H_ |
| OLD | NEW |