Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(737)

Unified Diff: chrome/browser/ui/extensions/application_launch.cc

Issue 10689071: Deprecate --aura-panels (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix WindowOpenPanelTest.CloseNonExtensionPanelsOnUninstall Created 8 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/ui/browser.cc ('k') | chrome/browser/ui/panels/panel_app_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 d75d9caf5263d31c6cb8791c26204ae06532ea80..ef56de3cedabd9e19e7491235a750c3f337105f6 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(
jennb 2012/07/03 16:58:02 Delete in .h as well.
- 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->WebContents();
-#endif
-}
-
WebContents* OpenApplicationWindow(
Profile* profile,
const Extension* extension,
« no previous file with comments | « chrome/browser/ui/browser.cc ('k') | chrome/browser/ui/panels/panel_app_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698