| Index: chrome/browser/ui/panels/panel_drag_browsertest.cc
|
| diff --git a/chrome/browser/ui/panels/panel_drag_browsertest.cc b/chrome/browser/ui/panels/panel_drag_browsertest.cc
|
| index 08943efa73a5f68f799f1d546fd1730e414fc6c9..5342eee4f3efcb77c18bae47c1833cad6a1e56ff 100644
|
| --- a/chrome/browser/ui/panels/panel_drag_browsertest.cc
|
| +++ b/chrome/browser/ui/panels/panel_drag_browsertest.cc
|
| @@ -1076,7 +1076,13 @@ IN_PROC_BROWSER_TEST_F(PanelDragBrowserTest, DetachAndCancel) {
|
| panel_manager->CloseAll();
|
| }
|
|
|
| -IN_PROC_BROWSER_TEST_F(PanelDragBrowserTest, Attach) {
|
| +// http://crbug.com/175760
|
| +#if defined(OS_MAC)
|
| +#define MAYBE_Attach DISABLED_Attach
|
| +#else
|
| +#define MAYBE_Attach Attach
|
| +#endif
|
| +IN_PROC_BROWSER_TEST_F(PanelDragBrowserTest, MAYBE_Attach) {
|
| PanelManager* panel_manager = PanelManager::GetInstance();
|
| DockedPanelCollection* docked_collection = panel_manager->docked_collection();
|
| DetachedPanelCollection* detached_collection =
|
| @@ -1136,7 +1142,13 @@ IN_PROC_BROWSER_TEST_F(PanelDragBrowserTest, Attach) {
|
| panel_manager->CloseAll();
|
| }
|
|
|
| -IN_PROC_BROWSER_TEST_F(PanelDragBrowserTest, AttachAndCancel) {
|
| +// http://crbug.com/175760
|
| +#if defined(OS_MAC)
|
| +#define MAYBE_AttachAndCancel DISABLED_AttachAndCancel
|
| +#else
|
| +#define MAYBE_AttachAndCancel AttachAndCancel
|
| +#endif
|
| +IN_PROC_BROWSER_TEST_F(PanelDragBrowserTest, MAYBE_AttachAndCancel) {
|
| PanelManager* panel_manager = PanelManager::GetInstance();
|
| DockedPanelCollection* docked_collection = panel_manager->docked_collection();
|
| DetachedPanelCollection* detached_collection =
|
| @@ -1255,7 +1267,8 @@ IN_PROC_BROWSER_TEST_F(PanelDragBrowserTest, DetachAttachAndCancel) {
|
| }
|
|
|
| // Disabled on GTK in metacity: http://crbug.com/167114
|
| -#if defined(TOOLKIT_GTK)
|
| +// Disabled on Mac: http://crbug.com/175760
|
| +#if defined(TOOLKIT_GTK) || defined(OS_MAC)
|
| #define MAYBE_DetachWithSqueeze DISABLED_DetachWithSqueeze
|
| #else
|
| #define MAYBE_DetachWithSqueeze DetachWithSqueeze
|
| @@ -1342,8 +1355,8 @@ IN_PROC_BROWSER_TEST_F(PanelDragBrowserTest, MAYBE_DetachWithSqueeze) {
|
| panel_manager->CloseAll();
|
| }
|
|
|
| -// http://crbug.com/143247
|
| -#if defined(OS_LINUX)
|
| +// http://crbug.com/143247, http://crbug.com/175760
|
| +#if defined(OS_LINUX) || defined(OS_MAC)
|
| #define MAYBE_AttachWithSqueeze DISABLED_AttachWithSqueeze
|
| #else
|
| #define MAYBE_AttachWithSqueeze AttachWithSqueeze
|
|
|