Switch platform apps from a declarative launch container to handling an onLaunched event.

chrome/browser/ui/browser.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.h"
 
 #if defined(OS_WIN)
 #include <windows.h>
 #include <shellapi.h>
 #endif  // OS_WIN
@@ skipping 33 matching lines @@
 #include "chrome/browser/download/chrome_download_manager_delegate.h"
 #include "chrome/browser/download/download_item_model.h"
 #include "chrome/browser/download/download_service.h"
 #include "chrome/browser/download/download_service_factory.h"
 #include "chrome/browser/download/download_shelf.h"
 #include "chrome/browser/download/download_started_animation.h"
 #include "chrome/browser/download/download_util.h"
 #include "chrome/browser/extensions/browser_extension_window_controller.h"
 #include "chrome/browser/extensions/crx_installer.h"
 #include "chrome/browser/extensions/default_apps_trial.h"
-#include "chrome/browser/extensions/extension_browser_event_router.h"
+#include "chrome/browser/extensions/api/app/app_api.h"
 #include "chrome/browser/extensions/extension_prefs.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_tab_helper.h"
 #include "chrome/browser/extensions/extension_tabs_module.h"
 #include "chrome/browser/favicon/favicon_tab_helper.h"
 #include "chrome/browser/file_select_helper.h"
 #include "chrome/browser/first_run/first_run.h"
 #include "chrome/browser/google/google_url_tracker.h"
 #include "chrome/browser/infobars/infobar_tab_helper.h"
 #include "chrome/browser/instant/instant_controller.h"
@@ skipping 620 matching lines @@
     const Extension* extension,
     extension_misc::LaunchContainer container,
     const GURL& override_url,
     WindowOpenDisposition disposition) {
   WebContents* tab = NULL;
   ExtensionPrefs* prefs = profile->GetExtensionService()->extension_prefs();
   prefs->SetActiveBit(extension->id(), true);
 
   UMA_HISTOGRAM_ENUMERATION("Extensions.AppLaunchContainer", container, 100);
 
+  if (extension->is_platform_app()) {
+    extensions::AppEventRouter::DispatchOnLaunchedEvent(profile, extension);
+    return NULL;
+  }
+
   switch (container) {
-    case extension_misc::LAUNCH_SHELL: {
-      ShellWindow* shell_window = ShellWindow::Create(
-          profile,
-          extension,
-          UrlForExtension(extension, override_url));
-      if (shell_window)
-        tab = shell_window->web_contents();
+    case extension_misc::LAUNCH_NONE: {
+      NOTREACHED();
       break;
     }
     case extension_misc::LAUNCH_PANEL:
 #if defined(USE_ASH)
       if (extension &&
           CommandLine::ForCurrentProcess()->HasSwitch(
               ash::switches::kAuraPanelManager)) {
         tab = OpenApplicationPanel(profile, extension, override_url);
         break;
       }
@@ skipping 4783 matching lines @@
   if (contents && !allow_js_access) {
     contents->web_contents()->GetController().LoadURL(
         target_url,
         content::Referrer(),
         content::PAGE_TRANSITION_LINK,
         std::string());  // No extra headers.
   }
 
   return contents != NULL;
 }