| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "chrome/test/base/view_event_test_base.h" | 5 #include "chrome/test/base/view_event_test_base.h" |
| 6 | 6 |
| 7 #include "base/bind.h" | 7 #include "base/bind.h" |
| 8 #include "base/bind_helpers.h" | 8 #include "base/bind_helpers.h" |
| 9 #include "base/message_loop/message_loop.h" | 9 #include "base/message_loop/message_loop.h" |
| 10 #include "base/strings/string_number_conversions.h" | 10 #include "base/strings/string_number_conversions.h" |
| (...skipping 14 matching lines...) Expand all Loading... |
| 25 #include "ash/test/test_shell_delegate.h" | 25 #include "ash/test/test_shell_delegate.h" |
| 26 #endif | 26 #endif |
| 27 | 27 |
| 28 #if defined(USE_AURA) | 28 #if defined(USE_AURA) |
| 29 #include "ui/aura/client/event_client.h" | 29 #include "ui/aura/client/event_client.h" |
| 30 #include "ui/aura/env.h" | 30 #include "ui/aura/env.h" |
| 31 #include "ui/aura/test/aura_test_helper.h" | 31 #include "ui/aura/test/aura_test_helper.h" |
| 32 #include "ui/aura/window_event_dispatcher.h" | 32 #include "ui/aura/window_event_dispatcher.h" |
| 33 #include "ui/aura/window_tree_host.h" | 33 #include "ui/aura/window_tree_host.h" |
| 34 #include "ui/compositor/test/context_factories_for_test.h" | 34 #include "ui/compositor/test/context_factories_for_test.h" |
| 35 #include "ui/views/corewm/wm_state.h" | 35 #include "ui/wm/core/wm_state.h" |
| 36 #endif | 36 #endif |
| 37 | 37 |
| 38 #if defined(OS_CHROMEOS) | 38 #if defined(OS_CHROMEOS) |
| 39 #include "chromeos/audio/cras_audio_handler.h" | 39 #include "chromeos/audio/cras_audio_handler.h" |
| 40 #include "chromeos/dbus/dbus_thread_manager.h" | 40 #include "chromeos/dbus/dbus_thread_manager.h" |
| 41 #include "chromeos/network/network_handler.h" | 41 #include "chromeos/network/network_handler.h" |
| 42 #endif | 42 #endif |
| 43 | 43 |
| 44 namespace { | 44 namespace { |
| 45 | 45 |
| (...skipping 198 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 244 dnd_thread_.reset(NULL); | 244 dnd_thread_.reset(NULL); |
| 245 } | 245 } |
| 246 | 246 |
| 247 void ViewEventTestBase::RunTestMethod(const base::Closure& task) { | 247 void ViewEventTestBase::RunTestMethod(const base::Closure& task) { |
| 248 StopBackgroundThread(); | 248 StopBackgroundThread(); |
| 249 | 249 |
| 250 task.Run(); | 250 task.Run(); |
| 251 if (HasFatalFailure()) | 251 if (HasFatalFailure()) |
| 252 Done(); | 252 Done(); |
| 253 } | 253 } |
| OLD | NEW |