diff options
| author | Levchenko <slevchenko@SLevchenko-lws-unq> | 2016-08-02 14:32:27 +0300 |
|---|---|---|
| committer | Levchenko <slevchenko@SLevchenko-lws-unq> | 2016-08-04 17:30:30 +0300 |
| commit | bc315e4dea02052c20fa482e87eedf4beb3072e9 (patch) | |
| tree | 79cd17c1a00367e22fceda7f2282ca44222dcf8c /src/components/application_manager/include/application_manager/application_manager_impl.h | |
| parent | 1c2cf9caee4d58e030a9be7064ed3b05768a37f0 (diff) | |
| download | sdl_core-bc315e4dea02052c20fa482e87eedf4beb3072e9.tar.gz | |
Reduce dependence of ApplicationManager
Reduced dependence of `ApplicationManager`
from `ResumeCtrl` and `HMICapabilities`.
Related to: APPLINK-24892
Diffstat (limited to 'src/components/application_manager/include/application_manager/application_manager_impl.h')
| -rw-r--r-- | src/components/application_manager/include/application_manager/application_manager_impl.h | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/src/components/application_manager/include/application_manager/application_manager_impl.h b/src/components/application_manager/include/application_manager/application_manager_impl.h index 6249e15f35..0801d34a0e 100644 --- a/src/components/application_manager/include/application_manager/application_manager_impl.h +++ b/src/components/application_manager/include/application_manager/application_manager_impl.h @@ -30,8 +30,8 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_APPLICATION_MANAGER_IMPL_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_APPLICATION_MANAGER_IMPL_H_ #include <stdint.h> #include <vector> @@ -39,6 +39,7 @@ #include <set> #include <deque> #include <algorithm> +#include <memory> #include "application_manager/hmi_command_factory.h" #include "application_manager/application_manager.h" @@ -318,8 +319,8 @@ class ApplicationManagerImpl void OnApplicationRegistered(ApplicationSharedPtr app) OVERRIDE; - HMICapabilities& hmi_capabilities(); - const HMICapabilities& hmi_capabilities() const; + HMICapabilities& hmi_capabilities() OVERRIDE; + const HMICapabilities& hmi_capabilities() const OVERRIDE; /** * @brief ProcessQueryApp executes logic related to QUERY_APP system request. @@ -840,7 +841,7 @@ class ApplicationManagerImpl * @return Resume Controller */ resumption::ResumeCtrl& resume_controller() OVERRIDE { - return resume_ctrl_; + return *resume_ctrl_.get(); } /** @@ -1412,7 +1413,7 @@ class ApplicationManagerImpl // Thread that pumps messages audio pass thru to mobile. impl::AudioPassThruQueue audio_pass_thru_messages_; - HMICapabilities hmi_capabilities_; + std::auto_ptr<HMICapabilities> hmi_capabilities_; // The reason of HU shutdown mobile_api::AppInterfaceUnregisteredReason::eType unregister_reason_; @@ -1421,7 +1422,7 @@ class ApplicationManagerImpl * about persistent application data on disk, and save session ID for resuming * application in case INGITION_OFF or MASTER_RESSET */ - resumption::ResumeCtrl resume_ctrl_; + std::auto_ptr<resumption::ResumeCtrl> resume_ctrl_; NaviServiceStatusMap navi_service_status_; std::deque<uint32_t> navi_app_to_stop_; |