Commit 10293484 authored by stevenjb@chromium.org's avatar stevenjb@chromium.org

Restore panel behavior on Ash/ChromeOS

When we abandoned support for Ash Panels for v1 apps (--aura-panels flag), I inadvertently disabled the check that enables panels for Quasar.
The special panel behavior includes:
* Panels are treated like popup windows but are always-on-top
* Panel icons in the launcher use a large favicon by itself (instead of the default favicon framed in a rounded rectangle)

BUG=141763


Review URL: https://chromiumcodereview.appspot.com/10855225

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@152460 0039d316-1c4b-4281-b951-d872f2087c98
parent 47f3a131
......@@ -557,7 +557,7 @@ bool CreateWindowFunction::RunImpl() {
} else if (type_str == keys::kWindowTypeValuePanel) {
extension_id = GetExtension()->id();
bool use_panels = false;
#if !defined(OS_ANDROID) && !defined(USE_ASH)
#if !defined(OS_ANDROID)
use_panels = PanelManager::ShouldUsePanels(extension_id);
#endif
if (use_panels)
......
......@@ -220,13 +220,8 @@ IN_PROC_BROWSER_TEST_F(WindowOpenPanelTest,
CloseNonExtensionPanelsOnUninstall) {
if (!PanelManager::UseBrowserlessPanels())
return;
#if defined(USE_ASH)
int num_popups = 4;
int num_panels = 0;
#else
int num_popups = 2;
int num_panels = 2;
#endif
ASSERT_TRUE(StartTestServer());
// Setup listeners to wait on strings we expect the extension pages to send.
......@@ -260,12 +255,7 @@ IN_PROC_BROWSER_TEST_F(WindowOpenPanelTest,
// Wait for one tab and one popup in non-extension domain to stay open.
// Expect everything else, including panels, to close.
#if defined(USE_ASH)
// In Ash and additional popup remains for the "panel" non-extension domain.
num_popups = 2;
#else
num_popups = 1;
#endif
WaitForTabsAndPopups(browser(), 1, num_popups, 0);
}
......
......@@ -64,15 +64,6 @@ void BrowserFrame::InitBrowserFrame() {
#if defined(USE_AURA)
// Aura frames are translucent.
params.transparent = true;
#endif
#if defined(USE_ASH)
// Note: browser_view_->IsPanel() always returns false on Ash because the
// BrowserView is not a panel. For Browser child panels and popups, we want
// to set them to be always on top.
if (browser_view_->browser()->is_type_panel() &&
browser_view_->browser()->app_type() == Browser::APP_TYPE_CHILD) {
params.keep_on_top = true;
}
#endif
Init(params);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment