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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/ui/webui/print_preview_handler_unittest.cc

Issue 8658002: Print preview: Enable tests that were previous excluded on CrOS. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 9 years, 1 month 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 | « chrome/browser/printing/print_preview_tab_controller_unittest.cc ('k') | chrome/browser/ui/webui/print_preview_ui_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/webui/print_preview_handler_unittest.cc
===================================================================
--- chrome/browser/ui/webui/print_preview_handler_unittest.cc (revision 111212)
+++ chrome/browser/ui/webui/print_preview_handler_unittest.cc (working copy)
@@ -149,7 +149,9 @@
// Test crashs on TouchUI due to initiator tab's native view having no parent.
// http://crbug.com/104284
-#if defined(TOUCH_UI)
+// Crashes on Aura due to no FocusManager.
+// http://crbug.com/105186
+#if defined(TOUCH_UI) || defined(USE_AURA)
#define MAYBE_StickyMarginsCustom DISABLED_StickyMarginsCustom
#else
#define MAYBE_StickyMarginsCustom StickyMarginsCustom
@@ -174,7 +176,8 @@
}
// http://crbug.com/104284
-#if defined(TOUCH_UI)
+// http://crbug.com/105186
+#if defined(TOUCH_UI) || defined(USE_AURA)
#define MAYBE_StickyMarginsDefault DISABLED_StickyMarginsDefault
#else
#define MAYBE_StickyMarginsDefault StickyMarginsDefault
@@ -193,7 +196,8 @@
}
// http://crbug.com/104284
-#if defined(TOUCH_UI)
+// http://crbug.com/105186
+#if defined(TOUCH_UI) || defined(USE_AURA)
#define MAYBE_StickyMarginsCustomThenDefault \
DISABLED_StickyMarginsCustomThenDefault
#else
@@ -227,7 +231,8 @@
}
// http://crbug.com/104284
-#if defined(TOUCH_UI)
+// http://crbug.com/105186
+#if defined(TOUCH_UI) || defined(USE_AURA)
#define MAYBE_GetLastUsedMarginSettingsCustom \
DISABLED_GetLastUsedMarginSettingsCustom
#else
@@ -264,7 +269,8 @@
}
// http://crbug.com/104284
-#if defined(TOUCH_UI)
+// http://crbug.com/105186
+#if defined(TOUCH_UI) || defined(USE_AURA)
#define MAYBE_GetLastUsedMarginSettingsDefault \
DISABLED_GetLastUsedMarginSettingsDefault
#else
« no previous file with comments | « chrome/browser/printing/print_preview_tab_controller_unittest.cc ('k') | chrome/browser/ui/webui/print_preview_ui_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698