Revert 195698

> Send onLaunched to apps that don't listen to onRestarted.
> 
> BUG=230667,162057
> 
> Review URL: https://chromiumcodereview.appspot.com/14348015

TBR=koz@chromium.org

git-svn-id: svn://svn.chromium.org/chrome/branches/1494/src@197513 0039d316-1c4b-4281-b951-d872f2087c98

4 files changed, 10 insertions, 27 deletions

diff --git a/chrome/browser/extensions/api/app_runtime/app_runtime_api.cc b/chrome/browser/extensions/api/app_runtime/app_runtime_api.cc
index 2cbdbd7..10e29f57 100644
--- a/chrome/browser/extensions/api/app_runtime/app_runtime_api.cc
+++ b/chrome/browser/extensions/api/app_runtime/app_runtime_api.cc
@@ -10,7 +10,6 @@
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/extensions/api/file_handlers/app_file_handler_util.h"
-#include "chrome/browser/extensions/event_names.h"
 #include "chrome/browser/extensions/event_router.h"
 #include "chrome/browser/extensions/extension_system.h"
 #include "chrome/browser/profiles/profile.h"
@@ -22,8 +21,8 @@ namespace extensions {
 
 namespace {
 
-using event_names::kOnLaunched;
-using event_names::kOnRestarted;
+const char kOnLaunchedEvent[] = "app.runtime.onLaunched";
+const char kOnRestartedEvent[] = "app.runtime.onRestarted";
 
 void DispatchOnLaunchedEventImpl(const std::string& extension_id,
                                  scoped_ptr<base::ListValue> args,
@@ -36,11 +35,12 @@ void DispatchOnLaunchedEventImpl(const std::string& extension_id,
   // extension does not actually have a listener, the event will just be
   // ignored (but an app that doesn't listen for the onLaunched event doesn't
   // make sense anyway).
-  system->event_router()->AddLazyEventListener(kOnLaunched, extension_id);
-  scoped_ptr<Event> event(new Event(kOnLaunched, args.Pass()));
+  system->event_router()->AddLazyEventListener(kOnLaunchedEvent, extension_id);
+  scoped_ptr<Event> event(new Event(kOnLaunchedEvent, args.Pass()));
   event->restrict_to_profile = profile;
   system->event_router()->DispatchEventToExtension(extension_id, event.Pass());
-  system->event_router()->RemoveLazyEventListener(kOnLaunched, extension_id);
+  system->event_router()->RemoveLazyEventListener(kOnLaunchedEvent,
+                                                  extension_id);
 }
 
 }  // anonymous namespace
@@ -74,7 +74,7 @@ void AppEventRouter::DispatchOnRestartedEvent(
   }
   scoped_ptr<ListValue> arguments(new ListValue());
   arguments->Append(file_entries_list);
-  scoped_ptr<Event> event(new Event(kOnRestarted, arguments.Pass()));
+  scoped_ptr<Event> event(new Event(kOnRestartedEvent, arguments.Pass()));
   event->restrict_to_profile = profile;
   extensions::ExtensionSystem::Get(profile)->event_router()->
       DispatchEventToExtension(extension->id(), event.Pass());
diff --git a/chrome/browser/extensions/event_names.cc b/chrome/browser/extensions/event_names.cc
index 71e6b0b..188eb9c 100644
--- a/chrome/browser/extensions/event_names.cc
+++ b/chrome/browser/extensions/event_names.cc
@@ -97,9 +97,6 @@ const char kOnNotificationButtonClicked[] = "notifications.onButtonClicked";
 const char kOnNetworksChanged[] = "networkingPrivate.onNetworksChanged";
 const char kOnNetworkListChanged[] = "networkingPrivate.onNetworkListChanged";
 
-const char kOnLaunched[] = "app.runtime.onLaunched";
-const char kOnRestarted[] = "app.runtime.onRestarted";
-
 const char kOnAudioDeviceChanged[] = "audio.onDeviceChanged";
 
 }  // namespace event_names
diff --git a/chrome/browser/extensions/event_names.h b/chrome/browser/extensions/event_names.h
index fa66575..1e1610f 100644
--- a/chrome/browser/extensions/event_names.h
+++ b/chrome/browser/extensions/event_names.h
@@ -113,10 +113,6 @@ extern const char kOnNotificationButtonClicked[];
 extern const char kOnNetworksChanged[];
 extern const char kOnNetworkListChanged[];
 
-// Runtime.
-extern const char kOnLaunched[];
-extern const char kOnRestarted[];
-
 // Audio
 extern const char kOnAudioDeviceChanged[];
 
diff --git a/chrome/browser/extensions/platform_app_launcher.cc b/chrome/browser/extensions/platform_app_launcher.cc
index 6cd9a71..f4fdbf2 100644
--- a/chrome/browser/extensions/platform_app_launcher.cc
+++ b/chrome/browser/extensions/platform_app_launcher.cc
@@ -14,8 +14,6 @@
 #include "chrome/browser/extensions/api/app_runtime/app_runtime_api.h"
 #include "chrome/browser/extensions/api/file_handlers/app_file_handler_util.h"
 #include "chrome/browser/extensions/api/file_system/file_system_api.h"
-#include "chrome/browser/extensions/event_names.h"
-#include "chrome/browser/extensions/event_router.h"
 #include "chrome/browser/extensions/extension_host.h"
 #include "chrome/browser/extensions/extension_prefs.h"
 #include "chrome/browser/extensions/extension_process_manager.h"
@@ -417,17 +415,9 @@ void RestartPlatformAppWithFileEntries(
     Profile* profile,
     const Extension* extension,
     const std::vector<SavedFileEntry>& file_entries) {
-  bool listening_to_restart = ExtensionSystem::Get(profile)->event_router()->
-      ExtensionHasEventListener(extension->id(),
-                                event_names::kOnRestarted);
-
-  if (listening_to_restart) {
-    scoped_refptr<SavedFileEntryLauncher> launcher = new SavedFileEntryLauncher(
-        profile, extension, file_entries);
-    launcher->Launch();
-  } else {
-    LaunchPlatformAppWithNoData(profile, extension);
-  }
+  scoped_refptr<SavedFileEntryLauncher> launcher = new SavedFileEntryLauncher(
+      profile, extension, file_entries);
+  launcher->Launch();
 }
 
 }  // namespace extensions