OLD | NEW |
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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 <map> | 5 #include <map> |
6 | 6 |
7 #include "app/clipboard/clipboard.h" | 7 #include "app/clipboard/clipboard.h" |
8 #include "base/keyboard_codes.h" | 8 #include "base/keyboard_codes.h" |
9 #include "base/message_loop.h" | 9 #include "base/message_loop.h" |
10 #include "base/string_util.h" | 10 #include "base/string_util.h" |
| 11 #include "base/utf_string_conversions.h" |
11 #include "gfx/canvas_skia.h" | 12 #include "gfx/canvas_skia.h" |
12 #include "gfx/path.h" | 13 #include "gfx/path.h" |
13 #include "testing/gtest/include/gtest/gtest.h" | 14 #include "testing/gtest/include/gtest/gtest.h" |
14 #include "views/background.h" | 15 #include "views/background.h" |
15 #include "views/controls/button/checkbox.h" | 16 #include "views/controls/button/checkbox.h" |
16 #if defined(OS_WIN) | 17 #if defined(OS_WIN) |
17 #include "views/controls/button/native_button_win.h" | 18 #include "views/controls/button/native_button_win.h" |
18 #endif | 19 #endif |
19 #include "views/controls/native/native_view_host.h" | 20 #include "views/controls/native/native_view_host.h" |
20 #include "views/controls/scroll_view.h" | 21 #include "views/controls/scroll_view.h" |
(...skipping 1323 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1344 #endif | 1345 #endif |
1345 } | 1346 } |
1346 | 1347 |
1347 TEST_F(ViewTest, ChangeNativeViewHierarchyChangeHierarchy) { | 1348 TEST_F(ViewTest, ChangeNativeViewHierarchyChangeHierarchy) { |
1348 // TODO(georgey): Fix the test for Linux | 1349 // TODO(georgey): Fix the test for Linux |
1349 #if defined(OS_WIN) | 1350 #if defined(OS_WIN) |
1350 TestChangeNativeViewHierarchy test(this); | 1351 TestChangeNativeViewHierarchy test(this); |
1351 test.CheckChangingHierarhy(); | 1352 test.CheckChangingHierarhy(); |
1352 #endif | 1353 #endif |
1353 } | 1354 } |
OLD | NEW |