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

Side by Side Diff: ash/test/test_suite.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 | « ash/test/ash_test_base.cc ('k') | ash/wm/activation_controller.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 "ash/test/test_suite.h" 5 #include "ash/test/test_suite.h"
6 6
7 #include "base/file_path.h" 7 #include "base/file_path.h"
8 #include "base/path_service.h" 8 #include "base/path_service.h"
9 #include "build/build_config.h" 9 #include "build/build_config.h"
10 #include "ui/base/resource/resource_bundle.h" 10 #include "ui/base/resource/resource_bundle.h"
11 #include "ui/base/ui_base_paths.h" 11 #include "ui/base/ui_base_paths.h"
12 #include "ui/gfx/compositor/compositor_setup.h" 12 #include "ui/compositor/compositor_setup.h"
13 #include "ui/gfx/compositor/test/compositor_test_support.h" 13 #include "ui/compositor/test/compositor_test_support.h"
14 #include "ui/gfx/gfx_paths.h" 14 #include "ui/gfx/gfx_paths.h"
15 15
16 #if defined(OS_MACOSX) 16 #if defined(OS_MACOSX)
17 #include "ash/test/test_suite_init.h" 17 #include "ash/test/test_suite_init.h"
18 #endif 18 #endif
19 19
20 namespace ash { 20 namespace ash {
21 namespace test { 21 namespace test {
22 22
23 AuraShellTestSuite::AuraShellTestSuite(int argc, char** argv) 23 AuraShellTestSuite::AuraShellTestSuite(int argc, char** argv)
(...skipping 17 matching lines...) Expand all
41 } 41 }
42 42
43 void AuraShellTestSuite::Shutdown() { 43 void AuraShellTestSuite::Shutdown() {
44 ui::CompositorTestSupport::Terminate(); 44 ui::CompositorTestSupport::Terminate();
45 ui::ResourceBundle::CleanupSharedInstance(); 45 ui::ResourceBundle::CleanupSharedInstance();
46 base::TestSuite::Shutdown(); 46 base::TestSuite::Shutdown();
47 } 47 }
48 48
49 } // namespace test 49 } // namespace test
50 } // namespace ash 50 } // namespace ash
OLDNEW
« no previous file with comments | « ash/test/ash_test_base.cc ('k') | ash/wm/activation_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698