diff options
| author | DHNishi@gmail.com <DHNishi@gmail.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-20 00:41:57 +0000 |
|---|---|---|
| committer | DHNishi@gmail.com <DHNishi@gmail.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-20 00:41:57 +0000 |
| commit | e054ea1282bb5e221e43961202b378a8df43f496 (patch) | |
| tree | c402d642648d33a21ec024fbeeec2fe4abb46151 /apps/launcher.cc | |
| parent | 9e43d6eb69814ca81f900e04d54d9eb6224fc38d (diff) | |
| download | chromium_src-e054ea1282bb5e221e43961202b378a8df43f496.zip chromium_src-e054ea1282bb5e221e43961202b378a8df43f496.tar.gz chromium_src-e054ea1282bb5e221e43961202b378a8df43f496.tar.bz2 | |
JSON/IDL Compiler now generates event names as of r215660. Use these generated event names instead of custom constant strings.
BUG=268380
Review URL: https://chromiumcodereview.appspot.com/23013006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@218378 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'apps/launcher.cc')
| -rw-r--r-- | apps/launcher.cc | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/apps/launcher.cc b/apps/launcher.cc index b99cd49..e5990a5 100644 --- a/apps/launcher.cc +++ b/apps/launcher.cc @@ -14,7 +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" @@ -24,6 +23,7 @@ #include "chrome/browser/extensions/lazy_background_task_queue.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/apps/app_metro_infobar_delegate_win.h" +#include "chrome/common/extensions/api/app_runtime.h" #include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_messages.h" #include "content/public/browser/browser_thread.h" @@ -43,6 +43,8 @@ #include "win8/util/win8_util.h" #endif +namespace app_runtime = extensions::api::app_runtime; + using content::BrowserThread; using extensions::app_file_handler_util::FileHandlerForId; using extensions::app_file_handler_util::FileHandlerCanHandleFile; @@ -342,7 +344,7 @@ void RestartPlatformApp(Profile* profile, const Extension* extension) { ExtensionSystem::Get(profile)->event_router(); bool listening_to_restart = event_router-> ExtensionHasEventListener(extension->id(), - extensions::event_names::kOnRestarted); + app_runtime::OnRestarted::kEventName); if (listening_to_restart) { extensions::AppEventRouter::DispatchOnRestartedEvent(profile, extension); @@ -355,7 +357,7 @@ void RestartPlatformApp(Profile* profile, const Extension* extension) { extension_prefs->SetIsActive(extension->id(), false); bool listening_to_launch = event_router-> ExtensionHasEventListener(extension->id(), - extensions::event_names::kOnLaunched); + app_runtime::OnLaunched::kEventName); if (listening_to_launch && had_windows) LaunchPlatformAppWithNoData(profile, extension); |