1 files changed, 73 insertions, 5 deletions

diff --git a/src/components/application_manager/include/application_manager/application_impl.h b/src/components/application_manager/include/application_manager/application_impl.h
index ae63a2f8ae..dc2d8ce528 100644
--- a/src/components/application_manager/include/application_manager/application_impl.h
+++ b/src/components/application_manager/include/application_manager/application_impl.h
@@ -38,6 +38,7 @@
 #include <vector>
 #include <utility>
 #include <list>
+#include <forward_list>
 #include <stdint.h>
 
 #include "utils/date_time.h"
@@ -64,7 +65,8 @@ using namespace timer;
 namespace mobile_api = mobile_apis;
 namespace custom_str = custom_string;
 
-class ApplicationImpl : public virtual InitialApplicationDataImpl,
+class ApplicationImpl : public virtual Application,
+                        public virtual InitialApplicationDataImpl,
                         public virtual DynamicApplicationDataImpl {
  public:
   ApplicationImpl(
@@ -96,6 +98,10 @@ class ApplicationImpl : public virtual InitialApplicationDataImpl,
   }
   void set_is_navi(bool allow);
 
+  void set_mobile_projection_enabled(bool option);
+
+  bool mobile_projection_enabled() const;
+
   bool video_streaming_approved() const;
   void set_video_streaming_approved(bool state);
   bool audio_streaming_approved() const;
@@ -106,6 +112,8 @@ class ApplicationImpl : public virtual InitialApplicationDataImpl,
   bool audio_streaming_allowed() const;
   void set_audio_streaming_allowed(bool state);
 
+  bool SetVideoConfig(protocol_handler::ServiceType service_type,
+                      const smart_objects::SmartObject& params);
   void StartStreaming(protocol_handler::ServiceType service_type);
   void StopStreamingForce(protocol_handler::ServiceType service_type);
   void StopStreaming(protocol_handler::ServiceType service_type);
@@ -158,8 +166,9 @@ class ApplicationImpl : public virtual InitialApplicationDataImpl,
   virtual void set_grammar_id(uint32_t value);
   bool is_audio() const OVERRIDE;
 
-  virtual void set_protocol_version(const ProtocolVersion& protocol_version);
-  virtual ProtocolVersion protocol_version() const;
+  virtual void set_protocol_version(
+      const protocol_handler::MajorProtocolVersion& protocol_version);
+  virtual protocol_handler::MajorProtocolVersion protocol_version() const;
 
   virtual void set_is_resuming(bool is_resuming);
   virtual bool is_resuming() const;
@@ -184,7 +193,7 @@ class ApplicationImpl : public virtual InitialApplicationDataImpl,
   /**
    * @brief ResetDataInNone reset data counters in NONE
    */
-  virtual void ResetDataInNone();
+  virtual void ResetDataInNone() OVERRIDE;
 
   virtual DataAccessor<ButtonSubscriptions> SubscribedButtons() const OVERRIDE;
 
@@ -299,6 +308,39 @@ class ApplicationImpl : public virtual InitialApplicationDataImpl,
    */
   uint32_t GetAvailableDiskSpace() OVERRIDE;
 
+#ifdef SDL_REMOTE_CONTROL
+  /**
+   * @brief Sets current system context
+   * @param system_context new system context
+   */
+  void set_system_context(
+      const mobile_api::SystemContext::eType& system_context) OVERRIDE;
+  /**
+   * @brief Sets current audio streaming state
+   * @param state new audio streaming state
+   */
+  void set_audio_streaming_state(
+      const mobile_api::AudioStreamingState::eType& state) OVERRIDE;
+  /**
+   * @brief Sets current HMI level
+   * @param hmi_level new HMI level
+   */
+  void set_hmi_level(const mobile_api::HMILevel::eType& hmi_level) OVERRIDE;
+
+  /**
+   * @brief Get list of subscriptions to vehicle info notifications
+   * @return list of subscriptions to vehicle info notifications
+   */
+  const std::set<uint32_t>& SubscribesIVI() const OVERRIDE;
+
+  /**
+   * @brief Return pointer to extension by uid
+   * @param uid uid of extension
+   * @return Pointer to extension, if extension was initialized, otherwise NULL
+   */
+  AppExtensionPtr QueryInterface(AppExtensionUID uid) OVERRIDE;
+#endif
+
  protected:
   /**
    * @brief Clean up application folder. Persistent files will stay
@@ -328,6 +370,27 @@ class ApplicationImpl : public virtual InitialApplicationDataImpl,
    */
   void OnAudioStreamSuspend();
 
+#ifdef SDL_REMOTE_CONTROL
+  /**
+   * @brief Add extension to application
+   * @param extension pointer to extension
+   * @return true if success, false if extension already initialized
+   */
+  bool AddExtension(AppExtensionPtr extention) OVERRIDE;
+
+  /**
+   * @brief Remove extension from application
+   * @param uid uid of extension
+   * @return true if success, false if extension is not present
+   */
+  bool RemoveExtension(AppExtensionUID uid) OVERRIDE;
+
+  /**
+   * @brief Removes all extensions
+   */
+  void RemoveExtensions() OVERRIDE;
+#endif  // SDL_REMOTE_CONTROL
+
   std::string hash_val_;
   uint32_t grammar_id_;
 
@@ -338,6 +401,7 @@ class ApplicationImpl : public virtual InitialApplicationDataImpl,
   smart_objects::SmartObject* active_message_;
   bool is_media_;
   bool is_navi_;
+  bool mobile_projection_enabled_;
 
   bool video_streaming_approved_;
   bool audio_streaming_approved_;
@@ -365,7 +429,7 @@ class ApplicationImpl : public virtual InitialApplicationDataImpl,
   std::set<mobile_apis::ButtonName::eType> subscribed_buttons_;
   VehicleInfoSubscriptions subscribed_vehicle_info_;
   UsageStatistics usage_report_;
-  ProtocolVersion protocol_version_;
+  protocol_handler::MajorProtocolVersion protocol_version_;
   bool is_voice_communication_application_;
   sync_primitives::atomic_bool is_resuming_;
 
@@ -376,6 +440,10 @@ class ApplicationImpl : public virtual InitialApplicationDataImpl,
   Timer video_stream_suspend_timer_;
   Timer audio_stream_suspend_timer_;
 
+#ifdef SDL_REMOTE_CONTROL
+  std::list<AppExtensionPtr> extensions_;
+#endif  // SDL_REMOTE_CONTROL
+
   /**
    * @brief Defines number per time in seconds limits
    */