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

chrome/browser/ui/browser_init.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/browser_init.h"
 
 #include <algorithm>   // For max().
 #include <set>
 
 #include "base/bind.h"
@@ skipping 882 matching lines @@
     } else {
       DLOG(WARNING) << "Invalid http debugger port number " << port;
     }
   }
 
   // Open the required browser windows and tabs. First, see if
   // we're being run as an application window. If so, the user
   // opened an app shortcut.  Don't restore tabs or open initial
   // URLs in that case. The user should see the window as an app,
   // not as chrome.
-  if (OpenApplicationWindow(profile)) {
+  // Special case is when app switches are passed but we do want to restore
+  // session. In that case open app window + focus it after session is restored.
+  if (OpenApplicationWindow(profile) && !browser_defaults::kAppRestoreSession) {
     RecordLaunchModeHistogram(LM_AS_WEBAPP);
   } else {
+    Browser* browser_to_focus = NULL;
+    // In case of app mode + session restore we want to focus that app.
+    if (browser_defaults::kAppRestoreSession)
+      browser_to_focus = BrowserList::GetLastActive();
+
     RecordLaunchModeHistogram(urls_to_open.empty()?
                               LM_TO_BE_DECIDED : LM_WITH_URLS);
 
     // Notify user if the Preferences backup is invalid or changes to settings
     // affecting browser startup have been detected.
     CheckPreferencesBackup(profile);
 
     ProcessLaunchURLs(process_startup, urls_to_open);
 
     // If this is an app launch, but we didn't open an app window, it may
     // be an app tab.
     OpenApplicationTab(profile);
 
+    if (browser_to_focus)
+      browser_to_focus->GetSelectedWebContents()->GetView()->SetInitialFocus();
+
     if (process_startup) {
       if (browser_defaults::kOSSupportsOtherBrowsers &&
           !command_line_.HasSwitch(switches::kNoDefaultBrowserCheck)) {
         if (!CheckIfAutoLaunched(profile)) {
           // Check whether we are the default browser.
           CheckDefaultBrowser(profile);
         }
       }
 #if defined(OS_MACOSX)
       // Check whether the auto-update system needs to be promoted from user
@@ skipping 981 matching lines @@
 
   Profile* profile = ProfileManager::GetLastUsedProfile();
   if (!profile) {
     // We should only be able to get here if the profile already exists and
     // has been created.
     NOTREACHED();
     return;
   }
   ProcessCmdLineImpl(cmd_line, cur_dir, false, profile, Profiles(), NULL, NULL);
 }