Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(7196)

Unified Diff: apps/app_window_browsertest.cc

Issue 232773008: More removal of GTK code. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | apps/ui/web_contents_sizer.cc » ('j') | chrome/browser/defaults.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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
« no previous file with comments | « no previous file | apps/ui/web_contents_sizer.cc » ('j') | chrome/browser/defaults.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698