app_shell: Remove chrome.shell.onLaunched.

app_shell can just use chrome.app.runtime.onLaunched now.

BUG=373821

Review URL: https://codereview.chromium.org/341333002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@279014 0039d316-1c4b-4281-b951-d872f2087c98

apps/shell/app_shell.gyp

@@ -131,8 +131,6 @@
         'browser/shell_network_controller_chromeos.h',
         'browser/shell_runtime_api_delegate.cc',
         'browser/shell_runtime_api_delegate.h',
-        'common/shell_app_runtime.cc',
-        'common/shell_app_runtime.h',
         'common/shell_content_client.cc',
         'common/shell_content_client.h',
         'common/shell_extensions_client.cc',

apps/shell/browser/api/shell/shell_api.cc

@@ -9,14 +9,11 @@
 #include "apps/shell/common/api/shell.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/values.h"
-#include "extensions/browser/event_router.h"
 #include "extensions/common/extension.h"
 
 using base::DictionaryValue;
-using base::ListValue;
 
 namespace CreateWindow = apps::shell_api::shell::CreateWindow;
-namespace OnLaunched = apps::shell_api::shell::OnLaunched;
 
 namespace apps {
 namespace {
@@ -34,17 +31,6 @@ DictionaryValue* CreateResult(apps::ShellAppWindow* app_window) {
 
 }  // namespace
 
-// static
-void ShellAPI::DispatchOnLaunchedEvent(extensions::EventRouter* event_router,
-                                       const extensions::Extension* extension) {
-  scoped_ptr<DictionaryValue> launch_data(new DictionaryValue());
-  scoped_ptr<ListValue> event_args(new ListValue());
-  event_args->Append(launch_data.release());
-  scoped_ptr<extensions::Event> event(
-      new extensions::Event(OnLaunched::kEventName, event_args.Pass()));
-  event_router->DispatchEventWithLazyListener(extension->id(), event.Pass());
-}
-
 ShellCreateWindowFunction::ShellCreateWindowFunction() {
 }
 

apps/shell/browser/api/shell/shell_api.h

@@ -10,24 +10,8 @@
 #include "extensions/browser/extension_function.h"
 #include "extensions/browser/extension_function_histogram_value.h"
 
-namespace extensions {
-class EventRouter;
-class Extension;
-}
-
 namespace apps {
 
-// Utilities for the chrome.shell API.
-class ShellAPI {
- public:
-  // Dispatches the onLaunched event.
-  static void DispatchOnLaunchedEvent(extensions::EventRouter* event_router,
-                                      const extensions::Extension* extension);
-
- private:
-  DISALLOW_IMPLICIT_CONSTRUCTORS(ShellAPI);
-};
-
 // Implementation of the chrome.shell.createWindow() function for app_shell.
 // Opens a fullscreen window and invokes the window callback to allow access to
 // the JS contentWindow.

apps/shell/browser/shell_extension_system.cc

@@ -15,6 +15,7 @@
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_source.h"
+#include "extensions/browser/api/app_runtime/app_runtime_api.h"
 #include "extensions/browser/event_router.h"
 #include "extensions/browser/extension_prefs.h"
 #include "extensions/browser/extension_registry.h"
@@ -81,8 +82,8 @@ bool ShellExtensionSystem::LoadApp(const base::FilePath& app_dir) {
 void ShellExtensionSystem::LaunchApp() {
   // Send the onLaunched event.
   DCHECK(extension_.get());
-  apps::ShellAPI::DispatchOnLaunchedEvent(event_router_.get(),
-                                          extension_.get());
+  AppRuntimeEventRouter::DispatchOnLaunchedEvent(browser_context_,
+                                                 extension_.get());
 }
 
 void ShellExtensionSystem::Shutdown() {

apps/shell/common/api/shell.idl

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-// Use the <code>chrome.shell</code> API to watch for launch events and create
-// windows. The <code>createWindow</code> API is a subset of
+// Use the <code>chrome.shell</code> API to create windows. The
+// <code>createWindow</code> API is a subset of
 // <code>chrome.app.window.create</code>.
 namespace shell {
 
@@ -33,9 +33,4 @@ namespace shell {
     [nocompile] static AppWindow currentWindow();
     [nocompile, nodoc] static void initializeAppWindow();
   };
-
-  interface Events {
-    // Fired when the app is launched at app_shell startup.
-    static void onLaunched(optional object launchDataPlaceholder);
-  };
 };

chrome/common/extensions/docs/examples/apps/calculator/app/controller.js

@@ -11,13 +11,10 @@
 // have chrome.app APIs.
 // Checking for "chrome.app.runtime" availability allows testing in a regular
 // web page (like tests/manual.html).
-if (typeof chrome !== 'undefined' &&
-    (chrome.shell || (chrome.app && chrome.app.runtime))) {
+if (typeof chrome !== 'undefined' && chrome.app && chrome.app.runtime) {
   // Compatibility for running under app_shell, which does not have app.window.
   var createWindow =
       chrome.shell ? chrome.shell.createWindow : chrome.app.window.create;
-  var onLaunched =
-      chrome.shell ? chrome.shell.onLaunched : chrome.app.runtime.onLaunched;
 
   var showCalculatorWindow = function () {
     createWindow('calculator.html', {
@@ -33,7 +30,7 @@ if (typeof chrome !== 'undefined' &&
     });
   }
 
-  onLaunched.addListener(showCalculatorWindow);
+  chrome.app.runtime.onLaunched.addListener(showCalculatorWindow);
 }
 
 function Controller(model, view) {

extensions/test/data/platform_app/background.js

@@ -5,10 +5,8 @@
 // Stub for app_shell.
 var createWindow =
     chrome.shell ? chrome.shell.createWindow : chrome.app.window.create;
-var onLaunched =
-    chrome.shell ? chrome.shell.onLaunched : chrome.app.runtime.onLaunched;
 
-onLaunched.addListener(function() {
+chrome.app.runtime.onLaunched.addListener(function() {
   createWindow('hello.html', {
     'innerBounds': {
       'width': 400,