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 "content/test/content_test_suite.h" | 5 #include "content/test/content_test_suite.h" |
6 | 6 |
7 #include "base/base_paths.h" | 7 #include "base/base_paths.h" |
8 #include "base/base_switches.h" | 8 #include "base/base_switches.h" |
9 #include "base/logging.h" | 9 #include "base/logging.h" |
| 10 #include "base/macros.h" |
| 11 #include "build/build_config.h" |
10 #include "content/public/common/content_client.h" | 12 #include "content/public/common/content_client.h" |
11 #include "content/public/common/content_paths.h" | 13 #include "content/public/common/content_paths.h" |
12 #include "content/public/test/test_content_client_initializer.h" | 14 #include "content/public/test/test_content_client_initializer.h" |
13 #include "gpu/config/gpu_util.h" | 15 #include "gpu/config/gpu_util.h" |
14 #include "testing/gtest/include/gtest/gtest.h" | 16 #include "testing/gtest/include/gtest/gtest.h" |
15 | 17 |
16 #if defined(OS_WIN) | 18 #if defined(OS_WIN) |
17 #include "ui/gfx/win/dpi.h" | 19 #include "ui/gfx/win/dpi.h" |
18 #endif | 20 #endif |
19 | 21 |
(...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
117 client_native_pixmap_factory_ = ui::ClientNativePixmapFactory::Create(); | 119 client_native_pixmap_factory_ = ui::ClientNativePixmapFactory::Create(); |
118 ui::ClientNativePixmapFactory::SetInstance( | 120 ui::ClientNativePixmapFactory::SetInstance( |
119 client_native_pixmap_factory_.get()); | 121 client_native_pixmap_factory_.get()); |
120 ui::ClientNativePixmapFactory::GetInstance()->Initialize( | 122 ui::ClientNativePixmapFactory::GetInstance()->Initialize( |
121 ui::OzonePlatform::GetInstance()->OpenClientNativePixmapDevice()); | 123 ui::OzonePlatform::GetInstance()->OpenClientNativePixmapDevice()); |
122 } | 124 } |
123 #endif | 125 #endif |
124 } | 126 } |
125 | 127 |
126 } // namespace content | 128 } // namespace content |
OLD | NEW |