Add 'show' window field that controls whether window should show on start.

zcbenz · zcbenz · commit a3502f8b73fc · 2012-10-12T22:34:45.000+08:00
diff --git a/src/browser/native_window.cc b/src/browser/native_window.cc
@@ -97,7 +97,10 @@ NativeWindow* NativeWindow::Create(content::Shell* shell,
   window->SetTitle(title);
 
   // Then show it.
-  window->Show();
+  bool show = true;
+  manifest->GetBoolean(switches::kmShow, &show);
+  if (show)
+    window->Show();
 
   return window;
 }
diff --git a/src/browser/native_window_mac.mm b/src/browser/native_window_mac.mm
@@ -289,7 +289,7 @@ - (void)showDevTools:(id)sender {
 }
 
 void NativeWindowCocoa::Focus(bool focus) {
-  if (focus)
+  if (focus && [window() isVisible])
     [window() makeKeyAndOrderFront:nil];
   else
     [window() orderBack:nil];
diff --git a/src/common/shell_switches.cc b/src/common/shell_switches.cc
@@ -74,5 +74,6 @@ const char kmMaxHeight[]  = "max_height";
 const char kmAsDesktop[]  = "as_desktop";
 const char kmFullscreen[] = "fullscreen";
 const char kmFrame[]      = "frame";
+const char kmShow[]       = "show";
 
 }  // namespace switches
diff --git a/src/common/shell_switches.h b/src/common/shell_switches.h
@@ -43,6 +43,7 @@ extern const char kmMaxHeight[];
 extern const char kmAsDesktop[];
 extern const char kmFullscreen[];
 extern const char kmFrame[];
+extern const char kmShow[];
 
 }  // namespace switches
 
diff --git a/src/shell.cc b/src/shell.cc
@@ -61,7 +61,11 @@ Shell* Shell::Create(BrowserContext* browser_context,
       base_web_contents);
 
   Shell* shell = new Shell(web_contents, GetPackage()->window());
-  shell->LoadURL(url);
+  web_contents->GetController().LoadURL(
+      url,
+      Referrer(),
+      PAGE_TRANSITION_TYPED,
+      std::string());
   return shell;
 }
 
diff --git a/tests/window/index.html b/tests/window/index.html
@@ -22,6 +22,8 @@
       win.close(true);
     this.close(true);
   });
+
+  gui.Window.get().show();
 </script>
 <button onclick="win.focus()">Focus</button>
 <br/>
diff --git a/tests/window/package.json b/tests/window/package.json
@@ -8,6 +8,7 @@
         "width": 400,
         "height": 500,
         "resizable": false,
+        "show": false,
         "frame": false
     }
 }
diff --git a/tests/window/popup.html b/tests/window/popup.html
@@ -3,7 +3,7 @@
   <meta http-equiv="content-type" content="text/html; charset=utf-8">
   <title>New Window</title>
 </head>
-<body>
+<body style="margin:0">
   <div style="width: 100%; height: 50px; background-color: green; -webkit-app-region: drag;">
   </div>
 This is the popup window<br/>
@@ -41,6 +41,10 @@
   win.on('restore', function() {
     console.log('Window is restored');
   });
+
+  window.onload = function() {
+    gui.Window.get().show();
+  }
 </script>
 <button onclick="javascript:enable = true;">Enable to be closed</button>
 <br/>

Original file line number	Diff line number	Diff line change
`@@ -289,7 +289,7 @@ - (void)showDevTools:(id)sender {`
`289`	`289`	`}`
`290`	`290`
`291`	`291`	`void NativeWindowCocoa::Focus(bool focus) {`
`292`		`- if (focus)`
	`292`	`+ if (focus && [window() isVisible])`
`293`	`293`	`[window() makeKeyAndOrderFront:nil];`
`294`	`294`	`else`
`295`	`295`	`[window() orderBack:nil];`
Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,7 @@`
`8`	`8`	`"width": 400,`
`9`	`9`	`"height": 500,`
`10`	`10`	`"resizable": false,`
	`11`	`+ "show": false,`
`11`	`12`	`"frame": false`
`12`	`13`	`}`
`13`	`14`	`}`