| 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 <string> | 9 #include <string> |
| 10 | 10 |
| (...skipping 349 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 360 const tracked_objects::Location& from_here, | 360 const tracked_objects::Location& from_here, |
| 361 const std::string& message) OVERRIDE; | 361 const std::string& message) OVERRIDE; |
| 362 | 362 |
| 363 // The functions below (until ActivateDataType()) should only be | 363 // The functions below (until ActivateDataType()) should only be |
| 364 // called if sync_initialized() is true. | 364 // called if sync_initialized() is true. |
| 365 | 365 |
| 366 // TODO(akalin): This is called mostly by ModelAssociators and | 366 // TODO(akalin): This is called mostly by ModelAssociators and |
| 367 // tests. Figure out how to pass the handle to the ModelAssociators | 367 // tests. Figure out how to pass the handle to the ModelAssociators |
| 368 // directly, figure out how to expose this to tests, and remove this | 368 // directly, figure out how to expose this to tests, and remove this |
| 369 // function. | 369 // function. |
| 370 sync_api::UserShare* GetUserShare() const; | 370 virtual sync_api::UserShare* GetUserShare() const; |
| 371 | 371 |
| 372 // TODO(akalin): These two functions are used only by | 372 // TODO(akalin): These two functions are used only by |
| 373 // ProfileSyncServiceHarness. Figure out a different way to expose | 373 // ProfileSyncServiceHarness. Figure out a different way to expose |
| 374 // this info to that class, and remove these functions. | 374 // this info to that class, and remove these functions. |
| 375 | 375 |
| 376 virtual const browser_sync::sessions::SyncSessionSnapshot* | 376 virtual const browser_sync::sessions::SyncSessionSnapshot* |
| 377 GetLastSessionSnapshot() const; | 377 GetLastSessionSnapshot() const; |
| 378 | 378 |
| 379 // Returns whether or not the underlying sync engine has made any | 379 // Returns whether or not the underlying sync engine has made any |
| 380 // local changes to items that have not yet been synced with the | 380 // local changes to items that have not yet been synced with the |
| (...skipping 295 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 676 scoped_ptr<SyncGlobalError> sync_global_error_; | 676 scoped_ptr<SyncGlobalError> sync_global_error_; |
| 677 | 677 |
| 678 DISALLOW_COPY_AND_ASSIGN(ProfileSyncService); | 678 DISALLOW_COPY_AND_ASSIGN(ProfileSyncService); |
| 679 }; | 679 }; |
| 680 | 680 |
| 681 bool ShouldShowActionOnUI( | 681 bool ShouldShowActionOnUI( |
| 682 const browser_sync::SyncProtocolError& error); | 682 const browser_sync::SyncProtocolError& error); |
| 683 | 683 |
| 684 | 684 |
| 685 #endif // CHROME_BROWSER_SYNC_PROFILE_SYNC_SERVICE_H_ | 685 #endif // CHROME_BROWSER_SYNC_PROFILE_SYNC_SERVICE_H_ |
| OLD | NEW |