Upstream version 5.34.104.0

[platform/framework/web/crosswalk.git] / src / xwalk / application / browser / application.cc

diff --git a/src/xwalk/application/browser/application.cc b/src/xwalk/application/browser/application.cc
index a1fe52e..940a4fd 100644 (file)
--- a/src/xwalk/application/browser/application.cc
+++ b/src/xwalk/application/browser/application.cc
@@ -39,7 +39,6 @@ const char* kDefaultWidgetEntryPage[] = {
 "index.svg",
 "index.xhtml",
 "index.xht"};
-const char kWidgetEntryPagePattern[] = "index.*";
 }  // namespace
 
 namespace application {
@@ -102,6 +101,8 @@ bool Application::Launch(const LaunchParams& launch_params) {
   if (entry_point_used_ != AppMainKey) {
     NativeAppWindow::CreateParams params;
     params.net_wm_pid = launch_params.launcher_pid;
+    params.state = launch_params.window_state;
+
     main_runtime_->AttachWindow(params);
   }
 
@@ -160,7 +161,7 @@ GURL Application::GetURLFromLocalPathKey() {
 
     base::FileEnumerator iter(application_data_->Path(), true,
                               base::FileEnumerator::FILES,
-                              FILE_PATH_LITERAL(kWidgetEntryPagePattern));
+                              FILE_PATH_LITERAL("index.*"));
     int priority = arraysize(kDefaultWidgetEntryPage);
 
     for (base::FilePath file = iter.Next(); !file.empty(); file = iter.Next()) {
@@ -235,7 +236,7 @@ void Application::OnRuntimeRemoved(Runtime* runtime) {
   runtimes_.erase(runtime);
 
   if (runtimes_.empty()) {
-#if defined(OS_TIZEN)
+#if defined(OS_TIZEN_MOBILE)
     runtime->CloseRootWindow();
 #endif
     base::MessageLoop::current()->PostTask(FROM_HERE,