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

Unified Diff: trunk/src/chrome/browser/ui/views/accelerator_table_unittest.cc

Issue 276773004: Revert 269892 "linux_aura: Compile ash into chrome." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 6 years, 7 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
Index: trunk/src/chrome/browser/ui/views/accelerator_table_unittest.cc
===================================================================
--- trunk/src/chrome/browser/ui/views/accelerator_table_unittest.cc (revision 269901)
+++ trunk/src/chrome/browser/ui/views/accelerator_table_unittest.cc (working copy)
@@ -43,7 +43,7 @@
}
}
-#if defined(OS_CHROMEOS)
+#if defined(USE_ASH) && !defined(OS_WIN)
TEST(AcceleratorTableTest, CheckDuplicatedAcceleratorsAsh) {
std::set<AcceleratorMapping, Cmp> acclerators;
const std::vector<AcceleratorMapping> accelerator_list(GetAcceleratorList());

Powered by Google App Engine
This is Rietveld 408576698