Index: chrome/browser/ui/extensions/application_launch.cc |
diff --git a/chrome/browser/ui/extensions/application_launch.cc b/chrome/browser/ui/extensions/application_launch.cc |
index e578ddbac16fed3a94864954ed4aaa41bac914b6..2258b18a93dc40ba2226251f4ba1111b221f8079 100644 |
--- a/chrome/browser/ui/extensions/application_launch.cc |
+++ b/chrome/browser/ui/extensions/application_launch.cc |
@@ -106,21 +106,7 @@ WebContents* OpenApplication(Profile* profile, |
NOTREACHED(); |
break; |
} |
- case extension_misc::LAUNCH_PANEL: { |
- bool open_panel = false; |
-#if defined(USE_ASH) |
- open_panel = CommandLine::ForCurrentProcess()->HasSwitch( |
- ash::switches::kAuraPanelManager); |
-#else |
- open_panel = CommandLine::ForCurrentProcess()->HasSwitch( |
- switches::kBrowserlessPanels); |
-#endif |
- if (open_panel) { |
- tab = OpenApplicationPanel(profile, extension, override_url); |
- break; |
- } |
- // else fall through to LAUNCH_WINDOW |
- } |
+ case extension_misc::LAUNCH_PANEL: |
case extension_misc::LAUNCH_WINDOW: |
tab = OpenApplicationWindow(profile, extension, container, |
override_url, NULL); |
@@ -137,28 +123,6 @@ WebContents* OpenApplication(Profile* profile, |
return tab; |
} |
-WebContents* OpenApplicationPanel( |
- Profile* profile, |
- const Extension* extension, |
- const GURL& url_input) { |
- GURL url = UrlForExtension(extension, url_input); |
- std::string app_name = |
- web_app::GenerateApplicationNameFromExtensionId(extension->id()); |
- gfx::Rect panel_bounds; |
- panel_bounds.set_width(extension->launch_width()); |
- panel_bounds.set_height(extension->launch_height()); |
-#if defined(USE_ASH) |
- PanelViewAura* panel_view = new PanelViewAura(app_name); |
- panel_view->Init(profile, url, panel_bounds); |
- return panel_view->WebContents(); |
-#else |
- Panel* panel = PanelManager::GetInstance()->CreatePanel( |
- app_name, profile, url, panel_bounds.size()); |
- panel->Show(); |
- return panel->GetWebContents(); |
-#endif |
-} |
- |
WebContents* OpenApplicationWindow( |
Profile* profile, |
const Extension* extension, |