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

Unified Diff: apps/app_window_browsertest.cc

Issue 210363004: Linux: App windows with frame: chrome and no color are now native. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Don't need not IsFrameless(); that is implied by has_frame_color_. Created 6 years, 9 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/views/app_window_frame_view.h » ('j') | no next file with comments »
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 cc411551ceb908cf440f5a0f220ffb49b677b6af..4c417c780373f85755e62795b9ad2b0244523ba8 100644
--- a/apps/app_window_browsertest.cc
+++ b/apps/app_window_browsertest.cc
@@ -13,7 +13,10 @@ namespace {
typedef extensions::PlatformAppBrowserTest AppWindowBrowserTest;
-#if defined(TOOLKIT_GTK)
+// 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))
#define MAYBE_FrameInsetsForDefaultFrame DISABLED_FrameInsetsForDefaultFrame
#else
#define MAYBE_FrameInsetsForDefaultFrame FrameInsetsForDefaultFrame
@@ -33,7 +36,10 @@ IN_PROC_BROWSER_TEST_F(AppWindowBrowserTest, MAYBE_FrameInsetsForDefaultFrame) {
CloseAppWindow(app_window);
}
-#if defined(TOOLKIT_GTK)
+// 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))
#define MAYBE_FrameInsetsForColoredFrame DISABLED_FrameInsetsForColoredFrame
#else
#define MAYBE_FrameInsetsForColoredFrame FrameInsetsForColoredFrame
« no previous file with comments | « no previous file | apps/ui/views/app_window_frame_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698