| Index: chrome/browser/ui/panels/docked_panel_browsertest.cc
|
| diff --git a/chrome/browser/ui/panels/docked_panel_browsertest.cc b/chrome/browser/ui/panels/docked_panel_browsertest.cc
|
| index fad6fc90407053bbab7184354e08ffcc28ef67cf..f79e91c694b6ee67324858a208bafafeae6b91d3 100644
|
| --- a/chrome/browser/ui/panels/docked_panel_browsertest.cc
|
| +++ b/chrome/browser/ui/panels/docked_panel_browsertest.cc
|
| @@ -91,7 +91,13 @@ IN_PROC_BROWSER_TEST_F(DockedPanelBrowserTest, MAYBE_SqueezePanelsInDock) {
|
| panel_manager->CloseAll();
|
| }
|
|
|
| -IN_PROC_BROWSER_TEST_F(DockedPanelBrowserTest, SqueezeAndThenSomeMore) {
|
| +#if defined(OS_LINUX)
|
| +// http://crbug.com/396484
|
| +#define MAYBE_SqueezeAndThenSomeMore DISABLED_SqueezeAndThenSomeMore
|
| +#else
|
| +#define MAYBE_SqueezeAndThenSomeMore SqueezeAndThenSomeMore
|
| +#endif
|
| +IN_PROC_BROWSER_TEST_F(DockedPanelBrowserTest, MAYBE_SqueezeAndThenSomeMore) {
|
| PanelManager* panel_manager = PanelManager::GetInstance();
|
| DockedPanelCollection* docked_collection = panel_manager->docked_collection();
|
|
|
|
|