Review fixes

2 files changed, 26 insertions, 28 deletions

diff --git a/partners_api/downloader_promo.cpp b/partners_api/downloader_promo.cpp
index ebfb06f170..df887e7208 100644
--- a/partners_api/downloader_promo.cpp
+++ b/partners_api/downloader_promo.cpp
@@ -5,13 +5,13 @@
 namespace promo
 {
 // static
-DownloaderPromoBanner DownloaderPromo::GetBanner(storage::Storage const & storage,
-                                                 std::string const & mwmId,
-                                                 std::string const & currentLocale,
-                                                 bool hasRemoveAdsSubscription)
+DownloaderPromo::Banner DownloaderPromo::GetBanner(storage::Storage const & storage,
+                                                   std::string const & mwmId,
+                                                   std::string const & currentLocale,
+                                                   bool hasRemoveAdsSubscription)
 {
   if (!hasRemoveAdsSubscription && ads::HasMegafonDownloaderBanner(storage, mwmId, currentLocale))
-    return {DownloaderPromoType::Megafon, ads::GetMegafonDownloaderBannerUrl()};
+    return {DownloaderPromo::Type::Megafon, ads::GetMegafonDownloaderBannerUrl()};
 
   // TODO: add bookmark catalog banner.
 
diff --git a/partners_api/downloader_promo.hpp b/partners_api/downloader_promo.hpp
index 7bbb2605d0..74d680bfcb 100644
--- a/partners_api/downloader_promo.hpp
+++ b/partners_api/downloader_promo.hpp
@@ -7,32 +7,30 @@
 
 namespace promo
 {
-// Do not change the order.
-enum class DownloaderPromoType : uint8_t
+class DownloaderPromo
 {
-  NoPromo = 0,
-  BookmarkCatalog = 1,
-  Megafon = 2
-};
+public:
+  // Do not change the order.
+  enum class Type : uint8_t
+  {
+    NoPromo = 0,
+    BookmarkCatalog = 1,
+    Megafon = 2
+  };
 
-struct DownloaderPromoBanner
-{
-  DownloaderPromoBanner() = default;
-  DownloaderPromoBanner(DownloaderPromoType type, std::string const & url)
-    : m_type(type)
-    , m_url(url)
-  {}
+  struct Banner
+  {
+    Banner() = default;
+    Banner(Type type, std::string const & url)
+      : m_type(type)
+      , m_url(url)
+    {}
 
-  DownloaderPromoType m_type = DownloaderPromoType::NoPromo;
-  std::string m_url;
-};
+    Type m_type = Type::NoPromo;
+    std::string m_url;
+  };
 
-class DownloaderPromo
-{
-public:
-  static DownloaderPromoBanner GetBanner(storage::Storage const & storage,
-                                         std::string const & mwmId,
-                                         std::string const & currentLocale,
-                                         bool hasRemoveAdsSubscription);
+  static Banner GetBanner(storage::Storage const & storage, std::string const & mwmId,
+                          std::string const & currentLocale, bool hasRemoveAdsSubscription);
 };
 }  // namespace promo