Chromium Code Reviews| Index: chrome/browser/ui/browser.cc |
| diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc |
| index 0d82525650de36e72b4b3d386eb9b29d9ee345bd..39fe0510c6065ae9435eae4989eeaeb36665695f 100644 |
| --- a/chrome/browser/ui/browser.cc |
| +++ b/chrome/browser/ui/browser.cc |
| @@ -50,7 +50,7 @@ |
| #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/runtime/runtime_api.h" |
| #include "chrome/browser/extensions/extension_prefs.h" |
| #include "chrome/browser/extensions/extension_service.h" |
| #include "chrome/browser/extensions/extension_tab_helper.h" |
| @@ -713,14 +713,14 @@ WebContents* Browser::OpenApplication( |
| UMA_HISTOGRAM_ENUMERATION("Extensions.AppLaunchContainer", container, 100); |
| + if (extension->is_platform_app()) { |
| + extensions::RuntimeEventRouter::DispatchOnLaunchedEvent(profile, extension); |
|
Matt Perry
2012/04/05 19:32:16
It feels weird to have this be a special case of O
Mihai Parparita -not on Chrome
2012/04/05 21:33:18
I don't think most callsites are aware that they'r
|
| + 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: |