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

Side by Side Diff: chrome/browser/extensions/extension_sync_service.cc

Issue 195873020: [Sync] Move SyncPrefs into sync_driver component (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rerererebase Created 6 years, 9 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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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/extensions/extension_sync_service.h" 5 #include "chrome/browser/extensions/extension_sync_service.h"
6 6
7 #include <iterator> 7 #include <iterator>
8 8
9 #include "base/basictypes.h" 9 #include "base/basictypes.h"
10 #include "base/threading/sequenced_worker_pool.h" 10 #include "base/threading/sequenced_worker_pool.h"
11 #include "base/threading/thread_restrictions.h" 11 #include "base/threading/thread_restrictions.h"
12 #include "chrome/browser/extensions/app_sync_data.h" 12 #include "chrome/browser/extensions/app_sync_data.h"
13 #include "chrome/browser/extensions/extension_error_ui.h" 13 #include "chrome/browser/extensions/extension_error_ui.h"
14 #include "chrome/browser/extensions/extension_gcm_app_handler.h" 14 #include "chrome/browser/extensions/extension_gcm_app_handler.h"
15 #include "chrome/browser/extensions/extension_service.h" 15 #include "chrome/browser/extensions/extension_service.h"
16 #include "chrome/browser/extensions/extension_sync_data.h" 16 #include "chrome/browser/extensions/extension_sync_data.h"
17 #include "chrome/browser/extensions/extension_sync_service_factory.h" 17 #include "chrome/browser/extensions/extension_sync_service_factory.h"
18 #include "chrome/browser/extensions/extension_util.h" 18 #include "chrome/browser/extensions/extension_util.h"
19 #include "chrome/browser/extensions/launch_util.h" 19 #include "chrome/browser/extensions/launch_util.h"
20 #include "chrome/browser/profiles/profile.h" 20 #include "chrome/browser/profiles/profile.h"
21 #include "chrome/browser/sync/glue/sync_start_util.h" 21 #include "chrome/browser/sync/glue/sync_start_util.h"
22 #include "chrome/browser/sync/sync_prefs.h"
23 #include "chrome/common/extensions/sync_helper.h" 22 #include "chrome/common/extensions/sync_helper.h"
23 #include "components/sync_driver/sync_prefs.h"
24 #include "extensions/browser/app_sorting.h" 24 #include "extensions/browser/app_sorting.h"
25 #include "extensions/browser/extension_prefs.h" 25 #include "extensions/browser/extension_prefs.h"
26 #include "extensions/browser/extension_registry.h" 26 #include "extensions/browser/extension_registry.h"
27 #include "extensions/common/extension.h" 27 #include "extensions/common/extension.h"
28 #include "extensions/common/feature_switch.h" 28 #include "extensions/common/feature_switch.h"
29 #include "extensions/common/manifest_constants.h" 29 #include "extensions/common/manifest_constants.h"
30 #include "sync/api/sync_change.h" 30 #include "sync/api/sync_change.h"
31 #include "sync/api/sync_error_factory.h" 31 #include "sync/api/sync_error_factory.h"
32 32
33 using extensions::Extension; 33 using extensions::Extension;
34 using extensions::ExtensionPrefs; 34 using extensions::ExtensionPrefs;
35 using extensions::ExtensionRegistry; 35 using extensions::ExtensionRegistry;
36 using extensions::FeatureSwitch; 36 using extensions::FeatureSwitch;
37 using extensions::ExtensionGCMAppHandler; 37 using extensions::ExtensionGCMAppHandler;
38 38
39 ExtensionSyncService::ExtensionSyncService(Profile* profile, 39 ExtensionSyncService::ExtensionSyncService(Profile* profile,
40 ExtensionPrefs* extension_prefs, 40 ExtensionPrefs* extension_prefs,
41 ExtensionService* extension_service) 41 ExtensionService* extension_service)
42 : profile_(profile), 42 : profile_(profile),
43 extension_prefs_(extension_prefs), 43 extension_prefs_(extension_prefs),
44 extension_service_(extension_service), 44 extension_service_(extension_service),
45 app_sync_bundle_(this), 45 app_sync_bundle_(this),
46 extension_sync_bundle_(this), 46 extension_sync_bundle_(this),
47 pending_app_enables_( 47 pending_app_enables_(make_scoped_ptr(new sync_driver::SyncPrefs(
48 make_scoped_ptr(new browser_sync::SyncPrefs( 48 extension_prefs_->pref_service())),
49 extension_prefs_->pref_service())), 49 &app_sync_bundle_,
50 &app_sync_bundle_, 50 syncer::APPS),
51 syncer::APPS), 51 pending_extension_enables_(make_scoped_ptr(new sync_driver::SyncPrefs(
52 pending_extension_enables_( 52 extension_prefs_->pref_service())),
53 make_scoped_ptr(new browser_sync::SyncPrefs( 53 &extension_sync_bundle_,
54 extension_prefs_->pref_service())), 54 syncer::EXTENSIONS),
55 &extension_sync_bundle_,
56 syncer::EXTENSIONS),
57 extesnion_gcm_app_handler_(new ExtensionGCMAppHandler(profile)) { 55 extesnion_gcm_app_handler_(new ExtensionGCMAppHandler(profile)) {
58 SetSyncStartFlare(sync_start_util::GetFlareForSyncableService( 56 SetSyncStartFlare(sync_start_util::GetFlareForSyncableService(
59 profile_->GetPath())); 57 profile_->GetPath()));
60 58
61 extension_service_->set_extension_sync_service(this); 59 extension_service_->set_extension_sync_service(this);
62 extension_prefs_->app_sorting()->SetExtensionSyncService(this); 60 extension_prefs_->app_sorting()->SetExtensionSyncService(this);
63 } 61 }
64 62
65 ExtensionSyncService::~ExtensionSyncService() {} 63 ExtensionSyncService::~ExtensionSyncService() {}
66 64
(...skipping 391 matching lines...) Expand 10 before | Expand all | Expand 10 after
458 app_sync_bundle_.SyncChangeIfNeeded(extension); 456 app_sync_bundle_.SyncChangeIfNeeded(extension);
459 else if (extension_service_->is_ready() && !flare_.is_null()) 457 else if (extension_service_->is_ready() && !flare_.is_null())
460 flare_.Run(syncer::APPS); 458 flare_.Run(syncer::APPS);
461 } else if (extensions::sync_helper::IsSyncableExtension(&extension)) { 459 } else if (extensions::sync_helper::IsSyncableExtension(&extension)) {
462 if (extension_sync_bundle_.IsSyncing()) 460 if (extension_sync_bundle_.IsSyncing())
463 extension_sync_bundle_.SyncChangeIfNeeded(extension); 461 extension_sync_bundle_.SyncChangeIfNeeded(extension);
464 else if (extension_service_->is_ready() && !flare_.is_null()) 462 else if (extension_service_->is_ready() && !flare_.is_null())
465 flare_.Run(syncer::EXTENSIONS); 463 flare_.Run(syncer::EXTENSIONS);
466 } 464 }
467 } 465 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698