| 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.h" | 9 #include "base/message_loop.h" |
| 10 #include "base/string_number_conversions.h" | 10 #include "base/string_number_conversions.h" |
| 11 #include "chrome/browser/automation/ui_controls.h" | |
| 12 #include "chrome/test/base/ui_test_utils.h" | 11 #include "chrome/test/base/ui_test_utils.h" |
| 13 #include "content/public/browser/browser_thread.h" | 12 #include "content/public/browser/browser_thread.h" |
| 14 #include "ui/gfx/compositor/test/compositor_test_support.h" | 13 #include "ui/gfx/compositor/test/compositor_test_support.h" |
| 14 #include "ui/ui_controls/ui_controls.h" |
| 15 #include "ui/views/view.h" | 15 #include "ui/views/view.h" |
| 16 #include "ui/views/widget/widget.h" | 16 #include "ui/views/widget/widget.h" |
| 17 | 17 |
| 18 #if defined(USE_AURA) | 18 #if defined(USE_AURA) |
| 19 #include "ash/shell.h" | 19 #include "ash/shell.h" |
| 20 #include "ui/aura/env.h" | 20 #include "ui/aura/env.h" |
| 21 #include "ui/aura/root_window.h" | 21 #include "ui/aura/root_window.h" |
| 22 #endif | 22 #endif |
| 23 | 23 |
| 24 namespace { | 24 namespace { |
| (...skipping 143 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 168 dnd_thread_.reset(NULL); | 168 dnd_thread_.reset(NULL); |
| 169 } | 169 } |
| 170 | 170 |
| 171 void ViewEventTestBase::RunTestMethod(const base::Closure& task) { | 171 void ViewEventTestBase::RunTestMethod(const base::Closure& task) { |
| 172 StopBackgroundThread(); | 172 StopBackgroundThread(); |
| 173 | 173 |
| 174 task.Run(); | 174 task.Run(); |
| 175 if (HasFatalFailure()) | 175 if (HasFatalFailure()) |
| 176 Done(); | 176 Done(); |
| 177 } | 177 } |
| OLD | NEW |