Chromium Code Reviews| Index: chrome/browser/ui/panels/panel_overflow_browsertest.cc |
| diff --git a/chrome/browser/ui/panels/panel_overflow_browsertest.cc b/chrome/browser/ui/panels/panel_overflow_browsertest.cc |
| index e7b6b06f9052f488361039665bd995b0a6c64b86..74be5bbcf4aa7d7305338de2b48566d6fb117dbc 100644 |
| --- a/chrome/browser/ui/panels/panel_overflow_browsertest.cc |
| +++ b/chrome/browser/ui/panels/panel_overflow_browsertest.cc |
| @@ -187,11 +187,10 @@ class PanelOverflowBrowserTest : public BasePanelBrowserTest { |
| // TODO(jianli): remove the guard when overflow support is enabled on other |
| // platforms. http://crbug.com/105073 |
| -#if defined(OS_WIN) |
| +#if defined(OS_WIN) || defined(OS_MACOSX) |
|
jennb
2012/02/07 00:50:31
I wonder if this will make it hard on Prasad to en
prasadt
2012/02/07 00:54:22
That's fine. I'll just fix-up as necessary. Should
|
| #define MAYBE_CheckPanelProperties CheckPanelProperties |
| #define MAYBE_UpdateDraggableStatus UpdateDraggableStatus |
| #define MAYBE_CreateOverflowPanels CreateOverflowPanels |
| -#define MAYBE_CreateMoreOverflowPanels CreateMoreOverflowPanels |
| // http://crbug.com/107230 |
| #define MAYBE_CreatePanelOnDelayedOverflow CreatePanelOnDelayedOverflow |
| #define MAYBE_CloseOverflowPanels CloseOverflowPanels |
| @@ -207,13 +206,10 @@ class PanelOverflowBrowserTest : public BasePanelBrowserTest { |
| #define MAYBE_HoverOverOverflowAreaWithOverflowOfOverflow \ |
| HoverOverOverflowAreaWithOverflowOfOverflow |
| #define MAYBE_ResizePanel ResizePanel |
| -#define MAYBE_OverflowIndicatorCount OverflowIndicatorCount |
| -#define MAYBE_DrawOverflowAttention DrawOverflowAttention |
| #else |
| #define MAYBE_CheckPanelProperties DISABLED_CheckPanelProperties |
| #define MAYBE_UpdateDraggableStatus DISABLED_UpdateDraggableStatus |
| #define MAYBE_CreateOverflowPanels DISABLED_CreateOverflowPanels |
| -#define MAYBE_CreateMoreOverflowPanels DISABLED_CreateMoreOverflowPanels |
| #define MAYBE_CreatePanelOnDelayedOverflow DISABLED_CreatePanelOnDelayedOverflow |
| #define MAYBE_CloseOverflowPanels DISABLED_CloseOverflowPanels |
| #define MAYBE_CloseDockedPanels DISABLED_CloseDockedPanels |
| @@ -228,6 +224,16 @@ class PanelOverflowBrowserTest : public BasePanelBrowserTest { |
| #define MAYBE_HoverOverOverflowAreaWithOverflowOfOverflow \ |
| DISABLED_HoverOverOverflowAreaWithOverflowOfOverflow |
| #define MAYBE_ResizePanel DISABLED_ResizePanel |
| +#endif |
| + |
| +// TODO(dimich): remove the guard when overflow indicator is implemented on |
| +// other platforms. |
| +#if defined(OS_WIN) |
| +#define MAYBE_CreateMoreOverflowPanels CreateMoreOverflowPanels |
| +#define MAYBE_OverflowIndicatorCount OverflowIndicatorCount |
| +#define MAYBE_DrawOverflowAttention DrawOverflowAttention |
| +#else |
| +#define MAYBE_CreateMoreOverflowPanels DISABLED_CreateMoreOverflowPanels |
| #define MAYBE_OverflowIndicatorCount DISABLED_OverflowIndicatorCount |
| #define MAYBE_DrawOverflowAttention DISABLED_DrawOverflowAttention |
| #endif |