Chromium Code Reviews| Index: ios/chrome/browser/ntp_content/ntp_content_service_factory.h |
| diff --git a/ios/chrome/browser/dom_distiller/dom_distiller_service_factory.h b/ios/chrome/browser/ntp_content/ntp_content_service_factory.h |
| similarity index 50% |
| copy from ios/chrome/browser/dom_distiller/dom_distiller_service_factory.h |
| copy to ios/chrome/browser/ntp_content/ntp_content_service_factory.h |
| index 80e2294e44f52989fe027faaaff3c98d4f860dc4..b6dbb2296836e15163d85321a3184ffbac26340a 100644 |
| --- a/ios/chrome/browser/dom_distiller/dom_distiller_service_factory.h |
| +++ b/ios/chrome/browser/ntp_content/ntp_content_service_factory.h |
| @@ -2,8 +2,8 @@ |
| // Use of this source code is governed by a BSD-style license that can be |
| // found in the LICENSE file. |
| -#ifndef IOS_CHROME_BROWSER_DOM_DISTILLER_DOM_DISTILLER_SERVICE_FACTORY_H_ |
| -#define IOS_CHROME_BROWSER_DOM_DISTILLER_DOM_DISTILLER_SERVICE_FACTORY_H_ |
| +#ifndef IOS_CHROME_BROWSER_NTP_CONTENT_NTP_CONTENT_SERVICE_FACTORY_H_ |
| +#define IOS_CHROME_BROWSER_NTP_CONTENT_NTP_CONTENT_SERVICE_FACTORY_H_ |
| #include "base/macros.h" |
| #include "base/memory/scoped_ptr.h" |
| @@ -14,27 +14,27 @@ template <typename T> |
| struct DefaultSingletonTraits; |
| } // namespace base |
| -namespace dom_distiller { |
| -class DomDistillerService; |
| -} |
| - |
| namespace ios { |
| class ChromeBrowserState; |
| } |
| -namespace dom_distiller { |
| +namespace ntp_content { |
|
blundell
2015/11/16 16:00:53
nit: After some amount of thrashing, the naming co
noyau (Ping after 24h)
2015/11/17 10:36:10
Done.
|
| + |
| +class NTPContentService; |
| -class DomDistillerServiceFactory : public BrowserStateKeyedServiceFactory { |
| +// A factory to create NTPContentService and associate them to |
| +// ios::ChromeBrowserState. |
| +class NTPContentServiceFactory : public BrowserStateKeyedServiceFactory { |
| public: |
| - static DomDistillerServiceFactory* GetInstance(); |
| - static DomDistillerService* GetForBrowserState( |
| + static NTPContentServiceFactory* GetInstance(); |
| + static NTPContentService* GetForBrowserState( |
| ios::ChromeBrowserState* browser_state); |
| private: |
| - friend struct base::DefaultSingletonTraits<DomDistillerServiceFactory>; |
| + friend struct base::DefaultSingletonTraits<NTPContentServiceFactory>; |
| - DomDistillerServiceFactory(); |
| - ~DomDistillerServiceFactory() override; |
| + NTPContentServiceFactory(); |
| + ~NTPContentServiceFactory() override; |
| // BrowserStateKeyedServiceFactory implementation. |
| scoped_ptr<KeyedService> BuildServiceInstanceFor( |
| @@ -42,9 +42,9 @@ class DomDistillerServiceFactory : public BrowserStateKeyedServiceFactory { |
| web::BrowserState* GetBrowserStateToUse( |
| web::BrowserState* context) const override; |
| - DISALLOW_COPY(DomDistillerServiceFactory); |
| + DISALLOW_COPY_AND_ASSIGN(NTPContentServiceFactory); |
| }; |
| -} // namespace dom_distiller |
| +} // namespace ntp_content |
| -#endif // IOS_CHROME_BROWSER_DOM_DISTILLER_DOM_DISTILLER_SERVICE_FACTORY_H_ |
| +#endif // IOS_CHROME_BROWSER_NTP_CONTENT_NTP_CONTENT_SERVICE_FACTORY_H_ |