Allow --app-list to be used in conjunction with --incognito for v1 apps.

chrome/browser/ui/startup/startup_browser_creator_impl.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/startup/startup_browser_creator_impl.h"
 
 #include <algorithm>
 #include <vector>
 
 #include "apps/app_restore_service.h"
@@ skipping 175 matching lines @@
     extension_misc::LaunchContainer* out_launch_container) {
 
   ExtensionService* extensions_service = profile->GetExtensionService();
   const Extension* extension =
       extensions_service->GetExtensionById(app_id, false);
 
   // The extension with id |app_id| may have been uninstalled.
   if (!extension)
     return false;
 
+  // Don't launch platform apps in incognito mode.
+  if (profile->IsOffTheRecord() && extension->is_platform_app())
+    return false;
+
   // Look at preferences to find the right launch container.  If no
   // preference is set, launch as a window.
   extension_misc::LaunchContainer launch_container =
       extensions_service->extension_prefs()->GetLaunchContainer(
           extension, extensions::ExtensionPrefs::LAUNCH_WINDOW);
 
   *out_extension = extension;
   *out_launch_container = launch_container;
   return true;
 }
@@ skipping 183 matching lines @@
       height = std::min(height, work_area.height());
       bounds->set_size(gfx::Size(width, height));
       bounds->set_x((work_area.width() - bounds->width()) / 2);
       // TODO(nkostylev): work_area does include launcher but should not.
       // Launcher auto hide pref is synced and is most likely not applied here.
       bounds->set_y((work_area.height() - bounds->height()) / 2);
     }
   }
 }
 
-bool StartupBrowserCreatorImpl::IsAppLaunch(Profile* profile,
-                                            std::string* app_url,
+bool StartupBrowserCreatorImpl::IsAppLaunch(std::string* app_url,
                                             std::string* app_id) {
-  // Don't launch apps in incognito mode.
-  if (profile->IsOffTheRecord())
-    return false;
   if (command_line_.HasSwitch(switches::kApp)) {
     if (app_url)
       *app_url = command_line_.GetSwitchValueASCII(switches::kApp);
     return true;
   }
   if (command_line_.HasSwitch(switches::kAppId)) {
     if (app_id)
       *app_id = command_line_.GetSwitchValueASCII(switches::kAppId);
     return true;
   }
   return false;
 }
 
 bool StartupBrowserCreatorImpl::OpenApplicationTab(Profile* profile) {
   std::string app_id;
   // App shortcuts to URLs always open in an app window.  Because this
   // function will open an app that should be in a tab, there is no need
   // to look at the app URL.  OpenApplicationWindow() will open app url
   // shortcuts.
-  if (!IsAppLaunch(profile, NULL, &app_id) || app_id.empty())
+  if (!IsAppLaunch(NULL, &app_id) || app_id.empty())
     return false;
 
   extension_misc::LaunchContainer launch_container;
   const Extension* extension;
   if (!GetAppLaunchContainer(profile, app_id, &extension, &launch_container))
     return false;
 
   // If the user doesn't want to open a tab, fail.
   if (launch_container != extension_misc::LAUNCH_TAB)
     return false;
 
   RecordCmdLineAppHistogram();
 
   WebContents* app_tab = chrome::OpenApplication(chrome::AppLaunchParams(
       profile, extension, extension_misc::LAUNCH_TAB, NEW_FOREGROUND_TAB));
   return (app_tab != NULL);
 }
 
 bool StartupBrowserCreatorImpl::OpenApplicationWindow(
     Profile* profile,
     content::WebContents** out_app_contents) {
   // Set |out_app_contents| to NULL early on (just in case).
   if (out_app_contents)
     *out_app_contents = NULL;
 
   std::string url_string, app_id;
-  if (!IsAppLaunch(profile, &url_string, &app_id))
+  if (!IsAppLaunch(&url_string, &app_id))
     return false;
 
   // This can fail if the app_id is invalid.  It can also fail if the
   // extension is external, and has not yet been installed.
   // TODO(skerner): Do something reasonable here. Pop up a warning panel?
   // Open an URL to the gallery page of the extension id?
   if (!app_id.empty()) {
     extension_misc::LaunchContainer launch_container;
     const Extension* extension;
     if (!GetAppLaunchContainer(profile, app_id, &extension, &launch_container))
@@ skipping 476 matching lines @@
 }
 
 #if !defined(OS_WIN) || defined(USE_AURA)
 // static
 bool StartupBrowserCreatorImpl::OpenStartupURLsInExistingBrowser(
     Profile* profile,
     const std::vector<GURL>& startup_urls) {
   return false;
 }
 #endif