Merge 135882 - [cros] Show release notes in app window + restore sesssion.

chrome/browser/chromeos/login/existing_user_controller.cc

Index: chrome/browser/chromeos/login/existing_user_controller.cc
===================================================================
--- chrome/browser/chromeos/login/existing_user_controller.cc	(revision 135895)
+++ chrome/browser/chromeos/login/existing_user_controller.cc	(working copy)
@@ -45,6 +45,7 @@
 #include "chrome/common/chrome_version_info.h"
 #include "chrome/common/net/gaia/google_service_auth_error.h"
 #include "chrome/common/pref_names.h"
+#include "chrome/common/url_constants.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_types.h"
@@ -738,6 +739,9 @@
   if (!guide_url.empty()) {
     CommandLine::ForCurrentProcess()->AppendSwitchASCII(switches::kApp,
                                                         guide_url);
+    // NTP would open in the background, app window with GSG would be focused
+    // so that user won't have an empty desktop after GSG is closed.
+    CommandLine::ForCurrentProcess()->AppendArg(chrome::kChromeUINewTabURL);
   } else {
     // We should not be adding any start URLs if guide
     // is defined as it launches as a standalone app window.
@@ -823,9 +827,8 @@
   if (current_version.components()[0] > prev_version.components()[0]) {
     std::string release_notes_url = GetGettingStartedGuideURL();
     if (!release_notes_url.empty()) {
-      // TODO(nkostylev): Ideally we'd want to show this in app window
-      // but passing --app=<url> would ignore session restore.
-      CommandLine::ForCurrentProcess()->AppendArg(release_notes_url);
+      CommandLine::ForCurrentProcess()->AppendSwitchASCII(switches::kApp,
+                                                          release_notes_url);
       prefs->SetString(prefs::kChromeOSReleaseNotesVersion,
                        current_version.GetString());
     }