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

Unified Diff: chrome/test/ui_test_utils.cc

Issue 115896: Making the browser tests work on Unix (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 11 years, 6 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: chrome/test/ui_test_utils.cc
===================================================================
--- chrome/test/ui_test_utils.cc (revision 17736)
+++ chrome/test/ui_test_utils.cc (working copy)
@@ -14,9 +14,11 @@
#include "chrome/common/chrome_paths.h"
#include "chrome/common/notification_registrar.h"
#include "chrome/common/notification_service.h"
+#if defined (OS_WIN)
+#include "views/widget/accelerator_handler.h"
+#endif
#include "googleurl/src/gurl.h"
#include "net/base/net_util.h"
-#include "views/widget/accelerator_handler.h"
namespace ui_test_utils {
@@ -101,8 +103,12 @@
MessageLoopForUI* loop = MessageLoopForUI::current();
bool did_allow_task_nesting = loop->NestableTasksAllowed();
loop->SetNestableTasksAllowed(true);
+#if defined (OS_WIN)
views::AcceleratorHandler handler;
loop->Run(&handler);
+#else
+ loop->Run();
+#endif
loop->SetNestableTasksAllowed(did_allow_task_nesting);
}

Powered by Google App Engine
This is Rietveld 408576698