chrome/browser/sync/profile_sync_service.h - Issue 1433473007: [NOT FOR REVIEW] Copy of Max's CL with conflicts fixed

Side by Side Diff: chrome/browser/sync/profile_sync_service.h

Issue 1433473007: [NOT FOR REVIEW] Copy of Max's CL with conflicts fixed (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@pss_strings

Patch Set: Created 5 years, 1 month ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View unified diff | Download patch

« no previous file with comments | « chrome/browser/sync/profile_sync_components_factory_impl.cc ('k') | chrome/browser/sync/profile_sync_service.cc » ('j') | no next file with comments »

OLD	NEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2012 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	7

8 #include <set>	8 #include <set>

9 #include <string>	9 #include <string>

10 #include <utility>	10 #include <utility>

11	11

12 #include "base/basictypes.h"	12 #include "base/basictypes.h"

13 #include "base/compiler_specific.h"	13 #include "base/compiler_specific.h"

14 #include "base/files/file_path.h"	14 #include "base/files/file_path.h"

15 #include "base/gtest_prod_util.h"	15 #include "base/gtest_prod_util.h"

16 #include "base/location.h"	16 #include "base/location.h"

17 #include "base/memory/memory_pressure_listener.h"	17 #include "base/memory/memory_pressure_listener.h"

18 #include "base/memory/scoped_ptr.h"	18 #include "base/memory/scoped_ptr.h"

19 #include "base/memory/weak_ptr.h"	19 #include "base/memory/weak_ptr.h"

20 #include "base/observer_list.h"	20 #include "base/observer_list.h"

21 #include "base/strings/string16.h"	21 #include "base/strings/string16.h"

22 #include "base/threading/thread_checker.h"	22 #include "base/threading/thread_checker.h"

23 #include "base/time/time.h"	23 #include "base/time/time.h"

24 #include "base/timer/timer.h"	24 #include "base/timer/timer.h"

25 #include "chrome/browser/sync/glue/sync_backend_host.h"

26 #include "components/keyed_service/core/keyed_service.h"	25 #include "components/keyed_service/core/keyed_service.h"

27 #include "components/signin/core/browser/signin_manager_base.h"	26 #include "components/signin/core/browser/signin_manager_base.h"

28 #include "components/sync_driver/backup_rollback_controller.h"	27 #include "components/sync_driver/backup_rollback_controller.h"

29 #include "components/sync_driver/data_type_controller.h"	28 #include "components/sync_driver/data_type_controller.h"

30 #include "components/sync_driver/data_type_manager.h"	29 #include "components/sync_driver/data_type_manager.h"

31 #include "components/sync_driver/data_type_manager_observer.h"	30 #include "components/sync_driver/data_type_manager_observer.h"

32 #include "components/sync_driver/data_type_status_table.h"	31 #include "components/sync_driver/data_type_status_table.h"

33 #include "components/sync_driver/device_info_sync_service.h"	32 #include "components/sync_driver/device_info_sync_service.h"

	33 #include "components/sync_driver/glue/sync_backend_host.h"

34 #include "components/sync_driver/local_device_info_provider.h"	34 #include "components/sync_driver/local_device_info_provider.h"

35 #include "components/sync_driver/protocol_event_observer.h"	35 #include "components/sync_driver/protocol_event_observer.h"

36 #include "components/sync_driver/startup_controller.h"	36 #include "components/sync_driver/startup_controller.h"

37 #include "components/sync_driver/sync_client.h"	37 #include "components/sync_driver/sync_client.h"

38 #include "components/sync_driver/sync_frontend.h"	38 #include "components/sync_driver/sync_frontend.h"

39 #include "components/sync_driver/sync_prefs.h"	39 #include "components/sync_driver/sync_prefs.h"

40 #include "components/sync_driver/sync_service.h"	40 #include "components/sync_driver/sync_service.h"

41 #include "components/sync_driver/sync_stopped_reporter.h"	41 #include "components/sync_driver/sync_stopped_reporter.h"

42 #include "components/version_info/version_info.h"	42 #include "components/version_info/version_info.h"

43 #include "google_apis/gaia/google_service_auth_error.h"	43 #include "google_apis/gaia/google_service_auth_error.h"

(...skipping 963 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
1007 base::WeakPtrFactory<ProfileSyncService> startup_controller_weak_factory_;	1007 base::WeakPtrFactory<ProfileSyncService> startup_controller_weak_factory_;

1008	1008

1009 DISALLOW_COPY_AND_ASSIGN(ProfileSyncService);	1009 DISALLOW_COPY_AND_ASSIGN(ProfileSyncService);

1010 };	1010 };

1011	1011

1012 bool ShouldShowActionOnUI(	1012 bool ShouldShowActionOnUI(

1013 const syncer::SyncProtocolError& error);	1013 const syncer::SyncProtocolError& error);

1014	1014

1015	1015

1016 #endif // CHROME_BROWSER_SYNC_PROFILE_SYNC_SERVICE_H_	1016 #endif // CHROME_BROWSER_SYNC_PROFILE_SYNC_SERVICE_H_

OLD	NEW