chrome/browser/sync/profile_sync_service.cc - Issue 469993006: Use a qualified path for chromium_strings, google_chrome_strings, and generated_resources.

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

Issue 469993006: Use a qualified path for chromium_strings, google_chrome_strings, and generated_resources. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 6 years, 4 months 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 | Annotate | Revision Log

« chrome/browser/password_manager/password_manager_util_win.cc ('K') | « chrome/browser/supervised_user/supervised_user_service.cc ('k') | chrome/browser/sync/profile_sync_service_android.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 #include "chrome/browser/sync/profile_sync_service.h"	5 #include "chrome/browser/sync/profile_sync_service.h"

6	6

7 #include <cstddef>	7 #include <cstddef>

8 #include <map>	8 #include <map>

9 #include <vector>	9 #include <vector>

10	10

(...skipping 46 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
57 #include "chrome/browser/sync/sync_type_preference_provider.h"	57 #include "chrome/browser/sync/sync_type_preference_provider.h"

58 #include "chrome/browser/ui/browser.h"	58 #include "chrome/browser/ui/browser.h"

59 #include "chrome/browser/ui/browser_list.h"	59 #include "chrome/browser/ui/browser_list.h"

60 #include "chrome/browser/ui/browser_window.h"	60 #include "chrome/browser/ui/browser_window.h"

61 #include "chrome/browser/ui/global_error/global_error_service.h"	61 #include "chrome/browser/ui/global_error/global_error_service.h"

62 #include "chrome/browser/ui/global_error/global_error_service_factory.h"	62 #include "chrome/browser/ui/global_error/global_error_service_factory.h"

63 #include "chrome/common/chrome_switches.h"	63 #include "chrome/common/chrome_switches.h"

64 #include "chrome/common/chrome_version_info.h"	64 #include "chrome/common/chrome_version_info.h"

65 #include "chrome/common/pref_names.h"	65 #include "chrome/common/pref_names.h"

66 #include "chrome/common/url_constants.h"	66 #include "chrome/common/url_constants.h"

	67 #include "chrome/grit/generated_resources.h"

67 #include "components/gcm_driver/gcm_driver.h"	68 #include "components/gcm_driver/gcm_driver.h"

68 #include "components/invalidation/invalidation_service.h"	69 #include "components/invalidation/invalidation_service.h"

69 #include "components/invalidation/profile_invalidation_provider.h"	70 #include "components/invalidation/profile_invalidation_provider.h"

70 #include "components/pref_registry/pref_registry_syncable.h"	71 #include "components/pref_registry/pref_registry_syncable.h"

71 #include "components/signin/core/browser/about_signin_internals.h"	72 #include "components/signin/core/browser/about_signin_internals.h"

72 #include "components/signin/core/browser/profile_oauth2_token_service.h"	73 #include "components/signin/core/browser/profile_oauth2_token_service.h"

73 #include "components/signin/core/browser/signin_manager.h"	74 #include "components/signin/core/browser/signin_manager.h"

74 #include "components/signin/core/browser/signin_metrics.h"	75 #include "components/signin/core/browser/signin_metrics.h"

75 #include "components/sync_driver/change_processor.h"	76 #include "components/sync_driver/change_processor.h"

76 #include "components/sync_driver/data_type_controller.h"	77 #include "components/sync_driver/data_type_controller.h"

77 #include "components/sync_driver/pref_names.h"	78 #include "components/sync_driver/pref_names.h"

78 #include "components/sync_driver/system_encryptor.h"	79 #include "components/sync_driver/system_encryptor.h"

79 #include "components/sync_driver/user_selectable_sync_type.h"	80 #include "components/sync_driver/user_selectable_sync_type.h"

80 #include "content/public/browser/browser_thread.h"	81 #include "content/public/browser/browser_thread.h"

81 #include "content/public/browser/notification_details.h"	82 #include "content/public/browser/notification_details.h"

82 #include "content/public/browser/notification_service.h"	83 #include "content/public/browser/notification_service.h"

83 #include "content/public/browser/notification_source.h"	84 #include "content/public/browser/notification_source.h"

84 #include "grit/generated_resources.h"

85 #include "net/cookies/cookie_monster.h"	85 #include "net/cookies/cookie_monster.h"

86 #include "net/url_request/url_request_context_getter.h"	86 #include "net/url_request/url_request_context_getter.h"

87 #include "sync/api/sync_error.h"	87 #include "sync/api/sync_error.h"

88 #include "sync/internal_api/public/configure_reason.h"	88 #include "sync/internal_api/public/configure_reason.h"

89 #include "sync/internal_api/public/http_bridge_network_resources.h"	89 #include "sync/internal_api/public/http_bridge_network_resources.h"

90 #include "sync/internal_api/public/network_resources.h"	90 #include "sync/internal_api/public/network_resources.h"

91 #include "sync/internal_api/public/sessions/type_debug_info_observer.h"	91 #include "sync/internal_api/public/sessions/type_debug_info_observer.h"

92 #include "sync/internal_api/public/shutdown_reason.h"	92 #include "sync/internal_api/public/shutdown_reason.h"

93 #include "sync/internal_api/public/sync_context_proxy.h"	93 #include "sync/internal_api/public/sync_context_proxy.h"

94 #include "sync/internal_api/public/sync_encryption_handler.h"	94 #include "sync/internal_api/public/sync_encryption_handler.h"

(...skipping 2584 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
2679 browser_sync::SyncedDeviceTracker* device_tracker =	2679 browser_sync::SyncedDeviceTracker* device_tracker =

2680 backend_->GetSyncedDeviceTracker();	2680 backend_->GetSyncedDeviceTracker();

2681 if (device_tracker)	2681 if (device_tracker)

2682 device_tracker->UpdateLocalDeviceBackupTime(*last_backup_time_);	2682 device_tracker->UpdateLocalDeviceBackupTime(*last_backup_time_);

2683 }	2683 }

2684 }	2684 }

2685	2685

2686 base::Time ProfileSyncService::GetDeviceBackupTimeForTesting() const {	2686 base::Time ProfileSyncService::GetDeviceBackupTimeForTesting() const {

2687 return backend_->GetSyncedDeviceTracker()->GetLocalDeviceBackupTime();	2687 return backend_->GetSyncedDeviceTracker()->GetLocalDeviceBackupTime();

2688 }	2688 }

OLD	NEW