Skip to content

GitLab

T
tangled
Commit b2010001 authored by stevenjb@chromium.org's avatar stevenjb@chromium.org
Browse files
Options

Create AppListSyncableService with BrowserContext 

BUG=352805
R=erg@chromium.org, jennyz@chromium.org, xiyuan@chromium.org

Review URL: https://codereview.chromium.org/217483004

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@261443 0039d316-1c4b-4281-b951-d872f2087c98
parent 0037157e
Hide whitespace changes
Inline Side-by-side
Showing with 53 additions and 23 deletions
chrome/browser/chromeos/customization_document_unittest.cc
View file @ b2010001
......@@ -386,6 +386,11 @@ TEST_F(ServicesCustomizationDocumentTest, DefaultApps) {
extensions::ExternalLoader* loader = doc->CreateExternalLoader(profile.get());
EXPECT_TRUE(loader);
app_list::AppListSyncableServiceFactory::GetInstance()->
SetTestingFactoryAndUse(
profile.get(),
&app_list::AppListSyncableServiceFactory::BuildInstanceFor);
MockExternalProviderVisitor visitor;
scoped_ptr<extensions::ExternalProviderImpl> provider(
new extensions::ExternalProviderImpl(
......
chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
View file @ b2010001
......@@ -40,6 +40,7 @@
#include "chrome/browser/sync/profile_sync_service_factory.h"
#include "chrome/browser/themes/theme_service_factory.h"
#include "chrome/browser/thumbnails/thumbnail_service_factory.h"
#include "chrome/browser/ui/app_list/app_list_syncable_service_factory.h"
#include "chrome/browser/ui/find_bar/find_bar_state_factory.h"
#include "chrome/browser/ui/global_error/global_error_service_factory.h"
#include "chrome/browser/ui/tabs/pinned_tab_service_factory.h"
......@@ -138,11 +139,14 @@ EnsureBrowserContextKeyedServiceFactoriesBuilt() {
apps::EnsureBrowserContextKeyedServiceFactoriesBuilt();
extensions::EnsureBrowserContextKeyedServiceFactoriesBuilt();
chrome_extensions::EnsureBrowserContextKeyedServiceFactoriesBuilt();
AppShortcutManagerFactory::GetInstance();
EphemeralAppServiceFactory::GetInstance();
#endif
#if defined(ENABLE_APP_LIST)
app_list::AppListSyncableServiceFactory::GetInstance();
#endif
AboutSigninInternalsFactory::GetInstance();
autofill::PersonalDataManagerFactory::GetInstance();
#if !defined(OS_ANDROID)
......
chrome/browser/ui/app_list/app_list_syncable_service.cc
View file @ b2010001
......@@ -223,11 +223,11 @@ void AppListSyncableService::BuildModel() {
DCHECK(profile_);
// TODO(stevenjb): Correctly handle OTR profiles for Guest mode.
if (!profile_->IsOffTheRecord() && SyncAppListEnabled()) {
DVLOG(1) << this << ": AppListSyncableService: InitializeWithService.";
VLOG(1) << this << ": AppListSyncableService: InitializeWithService.";
SyncStarted();
apps_builder_->InitializeWithService(this);
} else {
DVLOG(1) << this << ": AppListSyncableService: InitializeWithProfile.";
VLOG(1) << this << ": AppListSyncableService: InitializeWithProfile.";
apps_builder_->InitializeWithProfile(profile_, model_.get());
}
}
......@@ -266,15 +266,13 @@ void AppListSyncableService::AddItem(scoped_ptr<AppListItem> app_item) {
if (app_list::switches::IsFolderUIEnabled()) {
if (AppIsOem(app_item->id())) {
folder_id = FindOrCreateOemFolder();
DVLOG(1) << this << ": AddItem to OEM folder: " << sync_item->ToString();
VLOG(2) << this << ": AddItem to OEM folder: " << sync_item->ToString();
} else {
folder_id = sync_item->parent_id;
DVLOG(1) << this << ": AddItem: " << sync_item->ToString()
<< " Folder: '" << folder_id << "'";
}
}
DVLOG(1) << this << ": AddItem: " << sync_item->ToString()
<< "Folder: '" << folder_id << "'";
VLOG(2) << this << ": AddItem: " << sync_item->ToString()
<< "Folder: '" << folder_id << "'";
model_->AddItemToFolder(app_item.Pass(), folder_id);
}
......@@ -333,8 +331,8 @@ bool AppListSyncableService::RemoveDefaultApp(AppListItem* item,
// installed as a Default app, uninstall the app instead of adding it.
if (sync_item->item_type == sync_pb::AppListSpecifics::TYPE_APP &&
AppIsDefault(extension_system_->extension_service(), item->id())) {
DVLOG(1) << this << ": HandleDefaultApp: Uninstall: "
<< sync_item->ToString();
VLOG(2) << this << ": HandleDefaultApp: Uninstall: "
<< sync_item->ToString();
UninstallExtension(extension_system_->extension_service(), item->id());
return true;
}
......@@ -391,7 +389,7 @@ void AppListSyncableService::UpdateItem(AppListItem* app_item) {
}
void AppListSyncableService::RemoveSyncItem(const std::string& id) {
DVLOG(2) << this << ": RemoveSyncItem: " << id.substr(0, 8);
VLOG(2) << this << ": RemoveSyncItem: " << id.substr(0, 8);
SyncItemMap::iterator iter = sync_items_.find(id);
if (iter == sync_items_.end()) {
DVLOG(2) << this << " : RemoveSyncItem: No Item.";
......@@ -476,8 +474,8 @@ syncer::SyncMergeResult AppListSyncableService::MergeDataAndStartSyncing(
syncer::SyncMergeResult result = syncer::SyncMergeResult(type);
result.set_num_items_before_association(sync_items_.size());
DVLOG(1) << this << ": MergeDataAndStartSyncing: "
<< initial_sync_data.size();
VLOG(1) << this << ": MergeDataAndStartSyncing: "
<< initial_sync_data.size();
// Copy all sync items to |unsynced_items|.
std::set<std::string> unsynced_items;
......@@ -544,7 +542,7 @@ syncer::SyncDataList AppListSyncableService::GetAllSyncData(
syncer::ModelType type) const {
DCHECK_EQ(syncer::APP_LIST, type);
DVLOG(1) << this << ": GetAllSyncData: " << sync_items_.size();
VLOG(1) << this << ": GetAllSyncData: " << sync_items_.size();
syncer::SyncDataList list;
for (SyncItemMap::const_iterator iter = sync_items_.begin();
iter != sync_items_.end(); ++iter) {
......@@ -567,7 +565,7 @@ syncer::SyncError AppListSyncableService::ProcessSyncChanges(
// Don't observe the model while processing incoming sync changes.
model_observer_.reset();
DVLOG(1) << this << ": ProcessSyncChanges: " << change_list.size();
VLOG(1) << this << ": ProcessSyncChanges: " << change_list.size();
for (syncer::SyncChangeList::const_iterator iter = change_list.begin();
iter != change_list.end(); ++iter) {
const SyncChange& change = *iter;
......@@ -632,7 +630,7 @@ bool AppListSyncableService::ProcessSyncItemSpecifics(
}
void AppListSyncableService::ProcessNewSyncItem(SyncItem* sync_item) {
DVLOG(2) << "ProcessNewSyncItem: " << sync_item->ToString();
VLOG(2) << "ProcessNewSyncItem: " << sync_item->ToString();
switch (sync_item->item_type) {
case sync_pb::AppListSpecifics::TYPE_APP: {
// New apps are added through ExtensionAppModelBuilder.
......@@ -641,7 +639,7 @@ void AppListSyncableService::ProcessNewSyncItem(SyncItem* sync_item) {
return;
}
case sync_pb::AppListSpecifics::TYPE_REMOVE_DEFAULT_APP: {
DVLOG(1) << this << ": Uninstall: " << sync_item->ToString();
VLOG(1) << this << ": Uninstall: " << sync_item->ToString();
UninstallExtension(extension_system_->extension_service(),
sync_item->item_id);
return;
......@@ -667,7 +665,7 @@ void AppListSyncableService::ProcessExistingSyncItem(SyncItem* sync_item) {
sync_pb::AppListSpecifics::TYPE_REMOVE_DEFAULT_APP) {
return;
}
DVLOG(2) << "ProcessExistingSyncItem: " << sync_item->ToString();
VLOG(2) << "ProcessExistingSyncItem: " << sync_item->ToString();
AppListItem* app_item = model_->FindItem(sync_item->item_id);
DVLOG(2) << " AppItem: " << app_item->ToDebugString();
if (!app_item) {
......@@ -702,7 +700,7 @@ bool AppListSyncableService::SyncStarted() {
if (sync_processor_.get())
return true;
if (flare_.is_null()) {
DVLOG(2) << this << ": SyncStarted: Flare.";
VLOG(1) << this << ": SyncStarted: Flare.";
flare_ = sync_start_util::GetFlareForSyncableService(profile_->GetPath());
flare_.Run(syncer::APP_LIST);
}
......@@ -752,7 +750,7 @@ void AppListSyncableService::DeleteSyncItemSpecifics(
LOG(ERROR) << "Delete AppList item with empty ID";
return;
}
DVLOG(2) << this << ": DeleteSyncItemSpecifics: " << item_id.substr(0, 8);
VLOG(2) << this << ": DeleteSyncItemSpecifics: " << item_id.substr(0, 8);
SyncItemMap::iterator iter = sync_items_.find(item_id);
if (iter == sync_items_.end())
return;
......
chrome/browser/ui/app_list/app_list_syncable_service_factory.cc
View file @ b2010001
......@@ -27,10 +27,20 @@ AppListSyncableServiceFactory* AppListSyncableServiceFactory::GetInstance() {
return Singleton<AppListSyncableServiceFactory>::get();
}
// static
KeyedService* AppListSyncableServiceFactory::BuildInstanceFor(
content::BrowserContext* browser_context) {
Profile* profile = static_cast<Profile*>(browser_context);
VLOG(1) << "BuildServiceInstanceFor: " << profile->GetDebugName();
return new AppListSyncableService(profile,
extensions::ExtensionSystem::Get(profile));
}
AppListSyncableServiceFactory::AppListSyncableServiceFactory()
: BrowserContextKeyedServiceFactory(
"AppListSyncableService",
BrowserContextDependencyManager::GetInstance()) {
VLOG(1) << "AppListSyncableServiceFactory()";
DependsOn(
extensions::ExtensionsBrowserClient::Get()->GetExtensionSystemFactory());
}
......@@ -40,9 +50,7 @@ AppListSyncableServiceFactory::~AppListSyncableServiceFactory() {
KeyedService* AppListSyncableServiceFactory::BuildServiceInstanceFor(
content::BrowserContext* browser_context) const {
Profile* profile = static_cast<Profile*>(browser_context);
return new AppListSyncableService(profile,
extensions::ExtensionSystem::Get(profile));
return BuildInstanceFor(static_cast<Profile*>(browser_context));
}
void AppListSyncableServiceFactory::RegisterProfilePrefs(
......@@ -59,4 +67,14 @@ content::BrowserContext* AppListSyncableServiceFactory::GetBrowserContextToUse(
return chrome::GetBrowserContextRedirectedInIncognito(context);
}
bool AppListSyncableServiceFactory::ServiceIsCreatedWithBrowserContext() const {
// Start AppListSyncableService early so that the app list positions are
// available before the app list is opened.
return true;
}
bool AppListSyncableServiceFactory::ServiceIsNULLWhileTesting() const {
return true;
}
} // namespace app_list
chrome/browser/ui/app_list/app_list_syncable_service_factory.h
View file @ b2010001
......@@ -24,6 +24,9 @@ class AppListSyncableServiceFactory : public BrowserContextKeyedServiceFactory {
static AppListSyncableServiceFactory* GetInstance();
static KeyedService* BuildInstanceFor(
content::BrowserContext* browser_context);
private:
friend struct DefaultSingletonTraits<AppListSyncableServiceFactory>;
......@@ -37,6 +40,8 @@ class AppListSyncableServiceFactory : public BrowserContextKeyedServiceFactory {
user_prefs::PrefRegistrySyncable* registry) OVERRIDE;
virtual content::BrowserContext* GetBrowserContextToUse(
content::BrowserContext* context) const OVERRIDE;
virtual bool ServiceIsCreatedWithBrowserContext() const OVERRIDE;
virtual bool ServiceIsNULLWhileTesting() const OVERRIDE;
DISALLOW_COPY_AND_ASSIGN(AppListSyncableServiceFactory);
};
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment