Add 'fullscreen' field in manifest.

zcbenz · zcbenz · commit 53da0ecd60c7 · 2012-10-06T22:58:00.000+08:00
diff --git a/src/common/shell_switches.cc b/src/common/shell_switches.cc
@@ -52,25 +52,26 @@ const char kVersion[] = "version";
 // Set current working directory
 const char kWorkingDirectory[] = "working-directory";
 
-const char kmMain[]      = "main";
-const char kmName[]      = "name";
-const char kmWebkit[]    = "webkit";
-const char kmNodejs[]    = "nodejs";
-const char kmRoot[]      = "root";
-const char kmWindow[]    = "window";
-const char kmTitle[]     = "title";
-const char kmToolbar[]   = "toolbar";
-const char kmIcon[]      = "icon";
-const char kmWidth[]     = "width";
-const char kmHeight[]    = "height";
-const char kmX[]         = "x";
-const char kmY[]         = "y";
-const char kmResizable[] = "resizable";
-const char kmPosition[]  = "position";
-const char kmMinWidth[]  = "min_width";
-const char kmMinHeight[] = "min_height";
-const char kmMaxWidth[]  = "max_width";
-const char kmMaxHeight[] = "max_height";
-const char kmAsDesktop[] = "as_desktop";
+const char kmMain[]       = "main";
+const char kmName[]       = "name";
+const char kmWebkit[]     = "webkit";
+const char kmNodejs[]     = "nodejs";
+const char kmRoot[]       = "root";
+const char kmWindow[]     = "window";
+const char kmTitle[]      = "title";
+const char kmToolbar[]    = "toolbar";
+const char kmIcon[]       = "icon";
+const char kmWidth[]      = "width";
+const char kmHeight[]     = "height";
+const char kmX[]          = "x";
+const char kmY[]          = "y";
+const char kmResizable[]  = "resizable";
+const char kmPosition[]   = "position";
+const char kmMinWidth[]   = "min_width";
+const char kmMinHeight[]  = "min_height";
+const char kmMaxWidth[]   = "max_width";
+const char kmMaxHeight[]  = "max_height";
+const char kmAsDesktop[]  = "as_desktop";
+const char kmFullscreen[] = "fullscreen";
 
 }  // namespace switches
diff --git a/src/common/shell_switches.h b/src/common/shell_switches.h
@@ -41,6 +41,7 @@ extern const char kmMinHeight[];
 extern const char kmMaxWidth[];
 extern const char kmMaxHeight[];
 extern const char kmAsDesktop[];
+extern const char kmFullscreen[];
 
 }  // namespace switches
 
diff --git a/src/nw_package.cc b/src/nw_package.cc
@@ -212,8 +212,11 @@ bool Package::InitFromPath() {
     }
 
   // Force window field no empty.
-  if (!root_->HasKey(switches::kmWindow))
-    root_->Set(switches::kmWindow, new base::DictionaryValue());
+  if (!root_->HasKey(switches::kmWindow)) {
+    base::DictionaryValue* window = new base::DictionaryValue();
+    window->SetString(switches::kmPosition, "center");
+    root_->Set(switches::kmWindow, window);
+  }
 
   RelativePathToURI(path_, this->root());
   return true;
diff --git a/src/shell.cc b/src/shell.cc
@@ -113,6 +113,10 @@ Shell::Shell(WebContents* web_contents, base::DictionaryValue* manifest)
   if (manifest->GetBoolean(switches::kmResizable, &resizable)) {
     SetResizable(resizable);
   }
+  bool fullscreen;
+  if (manifest->GetBoolean(switches::kmFullscreen, &fullscreen) && fullscreen) {
+    EnterFullscreen();
+  }
   std::string title("node-webkit");
   manifest->GetString(switches::kmTitle, &title);
   SetTitle(title);
@@ -315,6 +319,7 @@ void Shell::WebContentsCreated(WebContents* source_contents,
   // Get window features
   WebKit::WebWindowFeatures features = new_contents->GetWindowFeatures();
   manifest->SetBoolean(switches::kmResizable, features.resizable);
+  manifest->SetBoolean(switches::kmFullscreen, features.fullscreen);
   if (features.widthSet)
     manifest->SetInteger(switches::kmWidth, features.width);
   if (features.heightSet)
