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

Unified Diff: apps/app_window_browsertest.cc

Issue 180803013: Fixed incorrect frame insets for app windows on ChromeOS (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed bad patch upload Created 6 years, 10 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 | ash/wm/header_painter.cc » ('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 c974c92f262b0ec4d92cea99848a6c18b29dae20..a2ba4a169aacfa636e82b04f548f310d3a8bdbdf 100644
--- a/apps/app_window_browsertest.cc
+++ b/apps/app_window_browsertest.cc
@@ -13,7 +13,7 @@ namespace {
typedef extensions::PlatformAppBrowserTest AppWindowBrowserTest;
-#if defined(OS_WIN) || defined(OS_MACOSX)
+#if !defined(OS_LINUX) || defined(USE_AURA)
#define MAYBE_FrameInsetsForDefaultFrame FrameInsetsForDefaultFrame
#else
#define MAYBE_FrameInsetsForDefaultFrame DISABLED_FrameInsetsForDefaultFrame
@@ -33,7 +33,7 @@ IN_PROC_BROWSER_TEST_F(AppWindowBrowserTest, MAYBE_FrameInsetsForDefaultFrame) {
CloseAppWindow(app_window);
}
-#if defined(OS_WIN) || defined(OS_MACOSX)
+#if !defined(OS_LINUX) || defined(USE_AURA)
benwells 2014/03/05 06:32:24 Are these just trying to disable on GTK? If so, de
tmdiep 2014/03/05 07:08:05 Yes. Changed now.
#define MAYBE_FrameInsetsForColoredFrame FrameInsetsForColoredFrame
#else
#define MAYBE_FrameInsetsForColoredFrame DISABLED_FrameInsetsForColoredFrame
« no previous file with comments | « no previous file | ash/wm/header_painter.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698