Chromium Code Reviews| Index: apps/app_window_browsertest.cc |
| diff --git a/apps/app_window_browsertest.cc b/apps/app_window_browsertest.cc |
| index e79a6d4ab237c9538cb0b47f99025df74f37c579..6d010a203f28a104de03813c42752912853180fb 100644 |
| --- a/apps/app_window_browsertest.cc |
| +++ b/apps/app_window_browsertest.cc |
| @@ -16,7 +16,7 @@ typedef extensions::PlatformAppBrowserTest AppWindowBrowserTest; |
| // This test is disabled on Linux because of the unpredictable nature of native |
| // windows. We cannot assume that the window manager will insert any title bar |
| // at all, so the test may fail on certain window managers. |
| -#if defined(TOOLKIT_GTK) || (defined(OS_LINUX) && !defined(OS_CHROMEOS)) |
| +#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) |
|
Lei Zhang
2014/04/11 21:07:04
nit: Remove extra parenthesis. Ditto below.
|
| #define MAYBE_FrameInsetsForDefaultFrame DISABLED_FrameInsetsForDefaultFrame |
| #else |
| #define MAYBE_FrameInsetsForDefaultFrame FrameInsetsForDefaultFrame |
| @@ -39,7 +39,7 @@ IN_PROC_BROWSER_TEST_F(AppWindowBrowserTest, MAYBE_FrameInsetsForDefaultFrame) { |
| // This test is also disabled on Linux because frame: color is ignored on stable |
| // and beta channels (so it can fail the same as the previous test). |
| // TODO(benwells): Re-enable on Linux after frame: color is on stable. |
| -#if defined(TOOLKIT_GTK) || (defined(OS_LINUX) && !defined(OS_CHROMEOS)) |
| +#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) |
| #define MAYBE_FrameInsetsForColoredFrame DISABLED_FrameInsetsForColoredFrame |
| #else |
| #define MAYBE_FrameInsetsForColoredFrame FrameInsetsForColoredFrame |