diff options
author | mked-luxoft <mked@luxoft.com> | 2019-08-09 15:04:57 +0300 |
---|---|---|
committer | Andriy Byzhynar (GitHub) <AByzhynar@luxoft.com> | 2019-08-20 21:17:13 +0300 |
commit | 20ad1ac80a0d24b03a53d5039ed039e728d52ae3 (patch) | |
tree | d22aabd6c851b33927f1eecd5493e1f6b3859b7a | |
parent | e96730b471a19d43d5de333de0e5c6af6db2e70a (diff) | |
download | sdl_core-20ad1ac80a0d24b03a53d5039ed039e728d52ae3.tar.gz |
fixup! Implement Resumption for widgets
6 files changed, 7 insertions, 7 deletions
diff --git a/src/components/application_manager/include/application_manager/application.h b/src/components/application_manager/include/application_manager/application.h index eaea69f2c9..c9e5a3d497 100644 --- a/src/components/application_manager/include/application_manager/application.h +++ b/src/components/application_manager/include/application_manager/application.h @@ -368,7 +368,7 @@ class DynamicApplicationData { * @param window_id unique id of a window * @param window_info SmartObject that represent window info */ - virtual void AddWindowInfo(const WindowID window_id, + virtual void SetWindowInfo(const WindowID window_id, const smart_objects::SmartObject& window_info) = 0; /* diff --git a/src/components/application_manager/include/application_manager/application_data_impl.h b/src/components/application_manager/include/application_manager/application_data_impl.h index 6df1f2b8c5..74857eddb2 100644 --- a/src/components/application_manager/include/application_manager/application_data_impl.h +++ b/src/components/application_manager/include/application_manager/application_data_impl.h @@ -180,7 +180,7 @@ class DynamicApplicationDataImpl : public virtual Application { */ bool IsSubMenuNameAlreadyExist(const std::string& name); - void AddWindowInfo(const WindowID window_id, + void SetWindowInfo(const WindowID window_id, const smart_objects::SmartObject& window_info) OVERRIDE; void RemoveWindowInfo(const WindowID window_id) OVERRIDE; diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/create_window_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/create_window_request.cc index 227ab79b70..52a06d7ef2 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/create_window_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/create_window_request.cc @@ -1,4 +1,4 @@ -/* +/* Copyright (c) 2019, Ford Motor Company All rights reserved. @@ -118,7 +118,7 @@ void CreateWindowRequest::ApplyWindowInitialState( window_info[strings::window_name] = window_name; - app->AddWindowInfo(window_id, window_info); + app->SetWindowInfo(window_id, window_info); app->SetInitialState(window_id, window_name, initial_state); diff --git a/src/components/application_manager/src/application_data_impl.cc b/src/components/application_manager/src/application_data_impl.cc index 9872bf15a9..c19998f6c0 100644 --- a/src/components/application_manager/src/application_data_impl.cc +++ b/src/components/application_manager/src/application_data_impl.cc @@ -670,7 +670,7 @@ DynamicApplicationDataImpl::window_optional_params_map() const { window_params_map_lock_ptr_); } -void DynamicApplicationDataImpl::AddWindowInfo( +void DynamicApplicationDataImpl::SetWindowInfo( const WindowID window_id, const smart_objects::SmartObject& window_info) { LOG4CXX_AUTO_TRACE(logger_); const auto it = window_params_map_.find(window_id); diff --git a/src/components/application_manager/src/resumption/resume_ctrl_impl.cc b/src/components/application_manager/src/resumption/resume_ctrl_impl.cc index 0e1220edf2..dfa2976114 100644 --- a/src/components/application_manager/src/resumption/resume_ctrl_impl.cc +++ b/src/components/application_manager/src/resumption/resume_ctrl_impl.cc @@ -279,7 +279,7 @@ void ResumeCtrlImpl::RestoreWidgetsHMIState( const auto window_name = msg_params[strings::window_name].asString(); window_info[strings::window_name] = window_name; - application->AddWindowInfo(window_id, window_info); + application->SetWindowInfo(window_id, window_info); const auto window_type = static_cast<mobile_apis::WindowType::eType>( msg_params[strings::window_type].asInt()); diff --git a/src/components/application_manager/test/include/application_manager/mock_application.h b/src/components/application_manager/test/include/application_manager/mock_application.h index 7171db7c3e..d90edbe2a1 100644 --- a/src/components/application_manager/test/include/application_manager/mock_application.h +++ b/src/components/application_manager/test/include/application_manager/mock_application.h @@ -407,7 +407,7 @@ class MockApplication : public ::application_manager::Application { void(const mobile_apis::HybridAppPreference::eType& hybrid_app_preference)); MOCK_METHOD1(set_cloud_app_certificate, void(const std::string& certificate)); - MOCK_METHOD2(AddWindowInfo, + MOCK_METHOD2(SetWindowInfo, void(const ::application_manager::WindowID windowID, const smart_objects::SmartObject& window_info)); MOCK_METHOD1(RemoveWindowInfo, |