From 8052db6ce78c7428a17bc98784b063519e6467b9 Mon Sep 17 00:00:00 2001 From: jaekuk lee Date: Tue, 27 Mar 2018 05:15:14 +0000 Subject: [PATCH] Revert "Handling App Control Data" This reverts commit fd80b9a284b4e8fcbf0787ce457a0e1c93498bc0. Change-Id: Ifdbad4f988f46c92ea5ffbde5a61ac4c69006c03 --- atom/app/ui_runtime.cc | 6 ------ atom/browser/browser.cc | 16 +--------------- atom/browser/browser.h | 8 ++------ 3 files changed, 3 insertions(+), 27 deletions(-) diff --git a/atom/app/ui_runtime.cc b/atom/app/ui_runtime.cc index 44cacf7..c85a63f 100644 --- a/atom/app/ui_runtime.cc +++ b/atom/app/ui_runtime.cc @@ -67,12 +67,6 @@ void UiRuntime::OnAppControl(app_control_h app_control) { common::AppDB* appdb = common::AppDB::GetInstance(); appdb->Set(kAppDBRuntimeSection, kAppDBRuntimeBundle, appcontrol->encoded_bundle()); - atom::Browser *browser_model = atom::Browser::Get(); - if (browser_model->is_ready()) { - browser_model->AppControl(std::move(appcontrol)); - } else { - browser_model->Launch(std::move(appcontrol)); - } } void UiRuntime::OnLanguageChanged(const std::string& language) { diff --git a/atom/browser/browser.cc b/atom/browser/browser.cc index 6de6ca1..42cc787 100644 --- a/atom/browser/browser.cc +++ b/atom/browser/browser.cc @@ -15,7 +15,7 @@ #include "base/run_loop.h" #include "base/threading/thread_task_runner_handle.h" #include "brightray/browser/brightray_paths.h" -#include "tizen/common/resource_manager.h" + namespace atom { Browser::Browser() @@ -222,19 +222,5 @@ void Browser::Show() { for (BrowserObserver& observer : observers_) observer.OnResume(); } -void Browser::AppControl( - std::unique_ptr appcontrol) { - std::unique_ptr res = - resource_manager_->GetStartResource(appcontrol.get()); - - bool do_reset = res->should_reset(); -//To do -} -void Browser::Launch(std::unique_ptr appcontrol) { -//To do -} - - - } // namespace atom diff --git a/atom/browser/browser.h b/atom/browser/browser.h index 08de521..fc674dd 100644 --- a/atom/browser/browser.h +++ b/atom/browser/browser.h @@ -16,9 +16,7 @@ #include "base/strings/string16.h" #include "base/values.h" #include "native_mate/arguments.h" -#include "tizen/common/app_control.h" -#include "tizen/common/application_data.h" -#include "tizen/common/resource_manager.h" + #if defined(OS_WIN) #include "base/files/file_path.h" #endif @@ -43,7 +41,7 @@ class Browser : public WindowListObserver { ~Browser(); static Browser* Get(); - std::unique_ptr resource_manager_; + // Try to close all windows and quit the application. void Quit(); @@ -108,8 +106,6 @@ class Browser : public WindowListObserver { void Hide(); void Show(); - void AppControl(std::unique_ptr appcontrol); - void Launch(std::unique_ptr appcontrol); #if defined(OS_MACOSX) // Hide the application. void Hide(); -- 2.7.4