Move chrome.experimental.app.onLaunched event handler to chrome.app.runtime.onLaunched.

chrome/browser/extensions/api/app/app_api.cc

Index: chrome/browser/extensions/api/app/app_api.cc
diff --git a/chrome/browser/extensions/api/app/app_api.cc b/chrome/browser/extensions/api/app/app_api.cc
index 22ccab68a4cb7ae663f60c773569eed38751ca7a..139ba6abf35d8b9e3e4fce7cd190862099f5da04 100644
--- a/chrome/browser/extensions/api/app/app_api.cc
+++ b/chrome/browser/extensions/api/app/app_api.cc
@@ -4,21 +4,13 @@
 
 #include "chrome/browser/extensions/api/app/app_api.h"
 
-#include "base/json/json_writer.h"
-#include "base/string_number_conversions.h"
 #include "base/time.h"
-#include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/extensions/app_notification_manager.h"
-#include "chrome/browser/extensions/event_router.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/profiles/profile.h"
-#include "chrome/common/chrome_notification_types.h"
-#include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_constants.h"
-#include "content/public/browser/notification_service.h"
 #include "googleurl/src/gurl.h"
-#include "webkit/glue/web_intent_data.h"
 
 namespace {
 
@@ -32,7 +24,6 @@ const char kInvalidExtensionIdError[] =
     "Invalid extension id";
 const char kMissingLinkTextError[] =
     "You must specify linkText if you use linkUrl";
-const char kOnLaunchedEvent[] = "experimental.app.onLaunched";
 
 }  // anonymous namespace
 
@@ -118,70 +109,4 @@ bool AppClearAllNotificationsFunction::RunImpl() {
   return true;
 }
 
-// static.
-void AppEventRouter::DispatchOnLaunchedEvent(
-    Profile* profile, const Extension* extension) {
-  scoped_ptr<ListValue> arguments(new ListValue());
-  profile->GetExtensionEventRouter()->DispatchEventToExtension(
-      extension->id(), kOnLaunchedEvent, arguments.Pass(), NULL, GURL());
-}
-
-// static.
-void AppEventRouter::DispatchOnLaunchedEventWithFileEntry(
-    Profile* profile, const Extension* extension, const string16& action,
-    const std::string& file_system_id, const std::string& base_name) {
-  scoped_ptr<ListValue> args(new ListValue());
-  DictionaryValue* launch_data = new DictionaryValue();
-  DictionaryValue* intent = new DictionaryValue();
-  intent->SetString("action", UTF16ToUTF8(action));
-  intent->SetString("type", "chrome-extension://fileentry");
-  launch_data->Set("intent", intent);
-  args->Append(launch_data);
-  DictionaryValue* intent_data = new DictionaryValue();
-  intent_data->SetString("format", "fileEntry");
-  intent_data->SetString("fileSystemId", file_system_id);
-  intent_data->SetString("baseName", base_name);
-  args->Append(intent_data);
-  profile->GetExtensionEventRouter()->DispatchEventToExtension(
-      extension->id(), kOnLaunchedEvent, args.Pass(), NULL, GURL());
-}
-
-// static.
-void AppEventRouter::DispatchOnLaunchedEventWithWebIntent(
-    Profile* profile, const Extension* extension,
-    const webkit_glue::WebIntentData web_intent_data) {
-  scoped_ptr<ListValue> args(new ListValue());
-  DictionaryValue* launch_data = new DictionaryValue();
-  DictionaryValue* intent = new DictionaryValue();
-  intent->SetString("action", UTF16ToUTF8(web_intent_data.action));
-  intent->SetString("type", UTF16ToUTF8(web_intent_data.type));
-  launch_data->Set("intent", intent);
-  args->Append(launch_data);
-  DictionaryValue* intent_data;
-  switch (web_intent_data.data_type) {
-    case webkit_glue::WebIntentData::SERIALIZED:
-      intent_data = new DictionaryValue();
-      intent_data->SetString("format", "serialized");
-      intent_data->SetString("data", UTF16ToUTF8(web_intent_data.data));
-      args->Append(intent_data);
-      break;
-    case webkit_glue::WebIntentData::UNSERIALIZED:
-      intent->SetString("data", UTF16ToUTF8(web_intent_data.unserialized_data));
-      break;
-    case webkit_glue::WebIntentData::BLOB:
-      intent_data = new DictionaryValue();
-      intent_data->SetString("format", "blob");
-      intent_data->SetString("blobFileName", web_intent_data.blob_file.value());
-      intent_data->SetString("blobLength",
-                             base::Int64ToString(web_intent_data.blob_length));
-      args->Append(intent_data);
-      break;
-    default:
-      NOTREACHED();
-      break;
-  }
-  profile->GetExtensionEventRouter()->DispatchEventToExtension(
-      extension->id(), kOnLaunchedEvent, args.Pass(), NULL, GURL());
-}
-
 }  // namespace extensions