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

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

Issue 3203008: Move prefs-related files under chrome/browser/ into a prefs/ subdir. (Closed) Base URL: http://src.chromium.org/git/chromium.git
Patch Set: Created 10 years, 3 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
OLDNEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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
11 #include "base/basictypes.h" 11 #include "base/basictypes.h"
12 #include "base/gtest_prod_util.h" 12 #include "base/gtest_prod_util.h"
13 #include "base/observer_list.h" 13 #include "base/observer_list.h"
14 #include "base/scoped_ptr.h" 14 #include "base/scoped_ptr.h"
15 #include "base/string16.h" 15 #include "base/string16.h"
16 #include "base/time.h" 16 #include "base/time.h"
17 #include "chrome/browser/pref_member.h" 17 #include "chrome/browser/prefs/pref_member.h"
18 #include "chrome/browser/sync/glue/data_type_controller.h" 18 #include "chrome/browser/sync/glue/data_type_controller.h"
19 #include "chrome/browser/sync/glue/data_type_manager.h" 19 #include "chrome/browser/sync/glue/data_type_manager.h"
20 #include "chrome/browser/sync/glue/session_model_associator.h" 20 #include "chrome/browser/sync/glue/session_model_associator.h"
21 #include "chrome/browser/sync/glue/sync_backend_host.h" 21 #include "chrome/browser/sync/glue/sync_backend_host.h"
22 #include "chrome/browser/sync/notification_method.h" 22 #include "chrome/browser/sync/notification_method.h"
23 #include "chrome/browser/sync/profile_sync_service_observer.h" 23 #include "chrome/browser/sync/profile_sync_service_observer.h"
24 #include "chrome/browser/sync/sync_setup_wizard.h" 24 #include "chrome/browser/sync/sync_setup_wizard.h"
25 #include "chrome/browser/sync/syncable/model_type.h" 25 #include "chrome/browser/sync/syncable/model_type.h"
26 #include "chrome/browser/sync/unrecoverable_error_handler.h" 26 #include "chrome/browser/sync/unrecoverable_error_handler.h"
27 #include "chrome/common/net/gaia/google_service_auth_error.h" 27 #include "chrome/common/net/gaia/google_service_auth_error.h"
(...skipping 423 matching lines...) Expand 10 before | Expand all | Expand 10 after
451 451
452 // This allows us to gracefully handle an ABORTED return code from the 452 // This allows us to gracefully handle an ABORTED return code from the
453 // DataTypeManager in the event that the server informed us to cease and 453 // DataTypeManager in the event that the server informed us to cease and
454 // desist syncing immediately. 454 // desist syncing immediately.
455 bool expect_sync_configuration_aborted_; 455 bool expect_sync_configuration_aborted_;
456 456
457 DISALLOW_COPY_AND_ASSIGN(ProfileSyncService); 457 DISALLOW_COPY_AND_ASSIGN(ProfileSyncService);
458 }; 458 };
459 459
460 #endif // CHROME_BROWSER_SYNC_PROFILE_SYNC_SERVICE_H_ 460 #endif // CHROME_BROWSER_SYNC_PROFILE_SYNC_SERVICE_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698