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

Side by Side Diff: chrome/test/base/view_event_test_base.cc

Issue 10365007: ui: Move compositor/ directory out of gfx/, up to ui/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix DEPS Created 8 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « chrome/test/base/in_process_browser_test.cc ('k') | chrome/test/gpu/gpu_pixel_browsertest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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/test/base/ui_test_utils.h" 11 #include "chrome/test/base/ui_test_utils.h"
12 #include "content/public/browser/browser_thread.h" 12 #include "content/public/browser/browser_thread.h"
13 #include "ui/gfx/compositor/test/compositor_test_support.h" 13 #include "ui/compositor/test/compositor_test_support.h"
14 #include "ui/ui_controls/ui_controls.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_ASH) 18 #if defined(USE_ASH)
19 #include "ash/shell.h" 19 #include "ash/shell.h"
20 #endif 20 #endif
21 #if defined(USE_AURA) 21 #if defined(USE_AURA)
22 #include "ui/aura/client/event_client.h" 22 #include "ui/aura/client/event_client.h"
23 #include "ui/aura/env.h" 23 #include "ui/aura/env.h"
(...skipping 154 matching lines...) Expand 10 before | Expand all | Expand 10 after
178 dnd_thread_.reset(NULL); 178 dnd_thread_.reset(NULL);
179 } 179 }
180 180
181 void ViewEventTestBase::RunTestMethod(const base::Closure& task) { 181 void ViewEventTestBase::RunTestMethod(const base::Closure& task) {
182 StopBackgroundThread(); 182 StopBackgroundThread();
183 183
184 task.Run(); 184 task.Run();
185 if (HasFatalFailure()) 185 if (HasFatalFailure())
186 Done(); 186 Done();
187 } 187 }
OLDNEW
« no previous file with comments | « chrome/test/base/in_process_browser_test.cc ('k') | chrome/test/gpu/gpu_pixel_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698