Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(161)

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: rebase 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
OLDNEW
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 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
58 #include "chrome/browser/sync/sync_type_preference_provider.h" 58 #include "chrome/browser/sync/sync_type_preference_provider.h"
59 #include "chrome/browser/ui/browser.h" 59 #include "chrome/browser/ui/browser.h"
60 #include "chrome/browser/ui/browser_list.h" 60 #include "chrome/browser/ui/browser_list.h"
61 #include "chrome/browser/ui/browser_window.h" 61 #include "chrome/browser/ui/browser_window.h"
62 #include "chrome/browser/ui/global_error/global_error_service.h" 62 #include "chrome/browser/ui/global_error/global_error_service.h"
63 #include "chrome/browser/ui/global_error/global_error_service_factory.h" 63 #include "chrome/browser/ui/global_error/global_error_service_factory.h"
64 #include "chrome/common/chrome_switches.h" 64 #include "chrome/common/chrome_switches.h"
65 #include "chrome/common/chrome_version_info.h" 65 #include "chrome/common/chrome_version_info.h"
66 #include "chrome/common/pref_names.h" 66 #include "chrome/common/pref_names.h"
67 #include "chrome/common/url_constants.h" 67 #include "chrome/common/url_constants.h"
68 #include "chrome/grit/generated_resources.h"
68 #include "components/gcm_driver/gcm_driver.h" 69 #include "components/gcm_driver/gcm_driver.h"
69 #include "components/invalidation/invalidation_service.h" 70 #include "components/invalidation/invalidation_service.h"
70 #include "components/invalidation/profile_invalidation_provider.h" 71 #include "components/invalidation/profile_invalidation_provider.h"
71 #include "components/password_manager/core/browser/password_store.h" 72 #include "components/password_manager/core/browser/password_store.h"
72 #include "components/pref_registry/pref_registry_syncable.h" 73 #include "components/pref_registry/pref_registry_syncable.h"
73 #include "components/signin/core/browser/about_signin_internals.h" 74 #include "components/signin/core/browser/about_signin_internals.h"
74 #include "components/signin/core/browser/profile_oauth2_token_service.h" 75 #include "components/signin/core/browser/profile_oauth2_token_service.h"
75 #include "components/signin/core/browser/signin_manager.h" 76 #include "components/signin/core/browser/signin_manager.h"
76 #include "components/signin/core/browser/signin_metrics.h" 77 #include "components/signin/core/browser/signin_metrics.h"
77 #include "components/sync_driver/change_processor.h" 78 #include "components/sync_driver/change_processor.h"
78 #include "components/sync_driver/data_type_controller.h" 79 #include "components/sync_driver/data_type_controller.h"
79 #include "components/sync_driver/pref_names.h" 80 #include "components/sync_driver/pref_names.h"
80 #include "components/sync_driver/system_encryptor.h" 81 #include "components/sync_driver/system_encryptor.h"
81 #include "components/sync_driver/user_selectable_sync_type.h" 82 #include "components/sync_driver/user_selectable_sync_type.h"
82 #include "content/public/browser/browser_thread.h" 83 #include "content/public/browser/browser_thread.h"
83 #include "content/public/browser/notification_details.h" 84 #include "content/public/browser/notification_details.h"
84 #include "content/public/browser/notification_service.h" 85 #include "content/public/browser/notification_service.h"
85 #include "content/public/browser/notification_source.h" 86 #include "content/public/browser/notification_source.h"
86 #include "grit/generated_resources.h"
87 #include "net/cookies/cookie_monster.h" 87 #include "net/cookies/cookie_monster.h"
88 #include "net/url_request/url_request_context_getter.h" 88 #include "net/url_request/url_request_context_getter.h"
89 #include "sync/api/sync_error.h" 89 #include "sync/api/sync_error.h"
90 #include "sync/internal_api/public/configure_reason.h" 90 #include "sync/internal_api/public/configure_reason.h"
91 #include "sync/internal_api/public/http_bridge_network_resources.h" 91 #include "sync/internal_api/public/http_bridge_network_resources.h"
92 #include "sync/internal_api/public/network_resources.h" 92 #include "sync/internal_api/public/network_resources.h"
93 #include "sync/internal_api/public/sessions/type_debug_info_observer.h" 93 #include "sync/internal_api/public/sessions/type_debug_info_observer.h"
94 #include "sync/internal_api/public/shutdown_reason.h" 94 #include "sync/internal_api/public/shutdown_reason.h"
95 #include "sync/internal_api/public/sync_context_proxy.h" 95 #include "sync/internal_api/public/sync_context_proxy.h"
96 #include "sync/internal_api/public/sync_encryption_handler.h" 96 #include "sync/internal_api/public/sync_encryption_handler.h"
(...skipping 2657 matching lines...) Expand 10 before | Expand all | Expand 10 after
2754 true)); 2754 true));
2755 } 2755 }
2756 2756
2757 bool ProfileSyncService::NeedBackup() const { 2757 bool ProfileSyncService::NeedBackup() const {
2758 return need_backup_; 2758 return need_backup_;
2759 } 2759 }
2760 2760
2761 base::Time ProfileSyncService::GetDeviceBackupTimeForTesting() const { 2761 base::Time ProfileSyncService::GetDeviceBackupTimeForTesting() const {
2762 return backend_->GetSyncedDeviceTracker()->GetLocalDeviceBackupTime(); 2762 return backend_->GetSyncedDeviceTracker()->GetLocalDeviceBackupTime();
2763 } 2763 }
OLDNEW
« no previous file with comments | « chrome/browser/supervised_user/supervised_user_service.cc ('k') | chrome/browser/sync/profile_sync_service_android.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698