diff options
Diffstat (limited to 'ios/chrome/browser')
5 files changed, 2 insertions, 119 deletions
diff --git a/ios/chrome/browser/BUILD.gn b/ios/chrome/browser/BUILD.gn index cea1de6..c95a033 100644 --- a/ios/chrome/browser/BUILD.gn +++ b/ios/chrome/browser/BUILD.gn @@ -53,8 +53,6 @@ source_set("browser") { "autofill/form_suggestion_view_client.h", "autofill/personal_data_manager_factory.cc", "autofill/personal_data_manager_factory.h", - "bookmarks/bookmark_client_factory.cc", - "bookmarks/bookmark_client_factory.h", "bookmarks/bookmark_client_impl.cc", "bookmarks/bookmark_client_impl.h", "bookmarks/bookmark_model_factory.cc", diff --git a/ios/chrome/browser/bookmarks/bookmark_client_factory.cc b/ios/chrome/browser/bookmarks/bookmark_client_factory.cc deleted file mode 100644 index 08f5c54..0000000 --- a/ios/chrome/browser/bookmarks/bookmark_client_factory.cc +++ /dev/null @@ -1,62 +0,0 @@ -// Copyright 2015 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#include "ios/chrome/browser/bookmarks/bookmark_client_factory.h" - -#include "base/memory/singleton.h" -#include "components/keyed_service/core/service_access_type.h" -#include "components/keyed_service/ios/browser_state_dependency_manager.h" -#include "ios/chrome/browser/bookmarks/bookmark_client_impl.h" -#include "ios/chrome/browser/browser_state/browser_state_otr_helper.h" -#include "ios/public/provider/chrome/browser/browser_state/chrome_browser_state.h" - -namespace { - -scoped_ptr<KeyedService> BuildBookmarkClientImpl(web::BrowserState* context) { - ios::ChromeBrowserState* browser_state = - ios::ChromeBrowserState::FromBrowserState(context); - return make_scoped_ptr(new BookmarkClientImpl(browser_state)); -} - -} // namespace - -// static -BookmarkClientImpl* BookmarkClientFactory::GetForBrowserState( - ios::ChromeBrowserState* browser_state) { - return static_cast<BookmarkClientImpl*>( - GetInstance()->GetServiceForBrowserState(browser_state, true)); -} - -// static -BookmarkClientFactory* BookmarkClientFactory::GetInstance() { - return base::Singleton<BookmarkClientFactory>::get(); -} - -// static -BrowserStateKeyedServiceFactory::TestingFactoryFunction -BookmarkClientFactory::GetDefaultFactory() { - return &BuildBookmarkClientImpl; -} - -BookmarkClientFactory::BookmarkClientFactory() - : BrowserStateKeyedServiceFactory( - "BookmarkClient", - BrowserStateDependencyManager::GetInstance()) { -} - -BookmarkClientFactory::~BookmarkClientFactory() {} - -scoped_ptr<KeyedService> BookmarkClientFactory::BuildServiceInstanceFor( - web::BrowserState* context) const { - return BuildBookmarkClientImpl(context); -} - -web::BrowserState* BookmarkClientFactory::GetBrowserStateToUse( - web::BrowserState* context) const { - return GetBrowserStateRedirectedInIncognito(context); -} - -bool BookmarkClientFactory::ServiceIsNULLWhileTesting() const { - return true; -} diff --git a/ios/chrome/browser/bookmarks/bookmark_client_factory.h b/ios/chrome/browser/bookmarks/bookmark_client_factory.h deleted file mode 100644 index 2217abc..0000000 --- a/ios/chrome/browser/bookmarks/bookmark_client_factory.h +++ /dev/null @@ -1,48 +0,0 @@ -// Copyright 2015 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef IOS_CHROME_BROWSER_BOOKMARKS_BOOKMARK_CLIENT_FACTORY_H_ -#define IOS_CHROME_BROWSER_BOOKMARKS_BOOKMARK_CLIENT_FACTORY_H_ - -#include "base/macros.h" -#include "base/memory/scoped_ptr.h" -#include "components/keyed_service/ios/browser_state_keyed_service_factory.h" - -namespace base { -template <typename T> -struct DefaultSingletonTraits; -} // namespase base - -class BookmarkClientImpl; - -namespace ios { -class ChromeBrowserState; -} - -// Singleton that owns all BookmarkClientImpls and associates them with -// ios::ChromeBrowserState. -class BookmarkClientFactory : public BrowserStateKeyedServiceFactory { - public: - static BookmarkClientImpl* GetForBrowserState( - ios::ChromeBrowserState* browser_state); - static BookmarkClientFactory* GetInstance(); - static TestingFactoryFunction GetDefaultFactory(); - - private: - friend struct base::DefaultSingletonTraits<BookmarkClientFactory>; - - BookmarkClientFactory(); - ~BookmarkClientFactory() override; - - // BrowserStateKeyedServiceFactory implementation. - scoped_ptr<KeyedService> BuildServiceInstanceFor( - web::BrowserState* context) const override; - web::BrowserState* GetBrowserStateToUse( - web::BrowserState* context) const override; - bool ServiceIsNULLWhileTesting() const override; - - DISALLOW_COPY_AND_ASSIGN(BookmarkClientFactory); -}; - -#endif // IOS_CHROME_BROWSER_BOOKMARKS_BOOKMARK_CLIENT_FACTORY_H_ diff --git a/ios/chrome/browser/bookmarks/bookmark_model_factory.cc b/ios/chrome/browser/bookmarks/bookmark_model_factory.cc index e386e8c..d199a67 100644 --- a/ios/chrome/browser/bookmarks/bookmark_model_factory.cc +++ b/ios/chrome/browser/bookmarks/bookmark_model_factory.cc @@ -13,7 +13,6 @@ #include "components/bookmarks/browser/startup_task_runner_service.h" #include "components/keyed_service/ios/browser_state_dependency_manager.h" #include "components/undo/bookmark_undo_service.h" -#include "ios/chrome/browser/bookmarks/bookmark_client_factory.h" #include "ios/chrome/browser/bookmarks/bookmark_client_impl.h" #include "ios/chrome/browser/bookmarks/startup_task_runner_service_factory.h" #include "ios/chrome/browser/browser_state/browser_state_otr_helper.h" @@ -48,7 +47,6 @@ BookmarkModelFactory::BookmarkModelFactory() : BrowserStateKeyedServiceFactory( "BookmarkModel", BrowserStateDependencyManager::GetInstance()) { - DependsOn(BookmarkClientFactory::GetInstance()); DependsOn(ios::BookmarkUndoServiceFactory::GetInstance()); DependsOn(ios::StartupTaskRunnerServiceFactory::GetInstance()); } @@ -64,10 +62,9 @@ scoped_ptr<KeyedService> BookmarkModelFactory::BuildServiceInstanceFor( web::BrowserState* context) const { ios::ChromeBrowserState* browser_state = ios::ChromeBrowserState::FromBrowserState(context); - BookmarkClientImpl* bookmark_client = - BookmarkClientFactory::GetForBrowserState(browser_state); scoped_ptr<bookmarks::BookmarkModel> bookmark_model( - new bookmarks::BookmarkModel(bookmark_client)); + new bookmarks::BookmarkModel( + make_scoped_ptr(new BookmarkClientImpl(browser_state)))); bookmark_model->Load( browser_state->GetPrefs(), browser_state->GetPrefs()->GetString(prefs::kAcceptLanguages), diff --git a/ios/chrome/browser/browser_state/browser_state_keyed_service_factories.mm b/ios/chrome/browser/browser_state/browser_state_keyed_service_factories.mm index 128a221..e7c9cd1 100644 --- a/ios/chrome/browser/browser_state/browser_state_keyed_service_factories.mm +++ b/ios/chrome/browser/browser_state/browser_state_keyed_service_factories.mm @@ -8,7 +8,6 @@ #include "ios/chrome/browser/autocomplete/in_memory_url_index_factory.h" #include "ios/chrome/browser/autocomplete/shortcuts_backend_factory.h" #include "ios/chrome/browser/autofill/personal_data_manager_factory.h" -#include "ios/chrome/browser/bookmarks/bookmark_client_factory.h" #include "ios/chrome/browser/bookmarks/bookmark_model_factory.h" #include "ios/chrome/browser/bookmarks/startup_task_runner_service_factory.h" #include "ios/chrome/browser/content_settings/cookie_settings_factory.h" @@ -54,7 +53,6 @@ // TODO(erg): This needs to be something else. I don't think putting every // FooServiceFactory here will scale or is desirable long term. void EnsureBrowserStateKeyedServiceFactoriesBuilt() { - BookmarkClientFactory::GetInstance(); dom_distiller::DomDistillerServiceFactory::GetInstance(); ios::AboutSigninInternalsFactory::GetInstance(); ios::AccountConsistencyServiceFactory::GetInstance(); |