| 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 "ui/aura/window.h" | 5 #include "ui/aura/window.h" |
| 6 | 6 |
| 7 #include <utility> | 7 #include <utility> |
| 8 | 8 |
| 9 #include "base/basictypes.h" | 9 #include "base/basictypes.h" |
| 10 #include "base/compiler_specific.h" | 10 #include "base/compiler_specific.h" |
| 11 #include "base/string_number_conversions.h" | 11 #include "base/string_number_conversions.h" |
| 12 #include "base/stringprintf.h" | 12 #include "base/stringprintf.h" |
| 13 #include "testing/gtest/include/gtest/gtest.h" | 13 #include "testing/gtest/include/gtest/gtest.h" |
| 14 #include "ui/aura/client/capture_client.h" | 14 #include "ui/aura/client/capture_client.h" |
| 15 #include "ui/aura/client/stacking_client.h" | 15 #include "ui/aura/client/stacking_client.h" |
| 16 #include "ui/aura/client/visibility_client.h" | 16 #include "ui/aura/client/visibility_client.h" |
| 17 #include "ui/aura/layout_manager.h" | 17 #include "ui/aura/layout_manager.h" |
| 18 #include "ui/aura/root_window.h" | 18 #include "ui/aura/root_window.h" |
| 19 #include "ui/aura/root_window_host.h" | 19 #include "ui/aura/root_window_host.h" |
| 20 #include "ui/aura/root_window_observer.h" | 20 #include "ui/aura/root_window_observer.h" |
| 21 #include "ui/aura/test/aura_test_base.h" | 21 #include "ui/aura/test/aura_test_base.h" |
| 22 #include "ui/aura/test/event_generator.h" | 22 #include "ui/aura/test/event_generator.h" |
| 23 #include "ui/aura/test/test_window_delegate.h" | 23 #include "ui/aura/test/test_window_delegate.h" |
| 24 #include "ui/aura/test/test_windows.h" | 24 #include "ui/aura/test/test_windows.h" |
| 25 #include "ui/aura/window_delegate.h" | 25 #include "ui/aura/window_delegate.h" |
| 26 #include "ui/aura/window_observer.h" | 26 #include "ui/aura/window_observer.h" |
| 27 #include "ui/aura/window_property.h" | 27 #include "ui/aura/window_property.h" |
| 28 #include "ui/base/event.h" | 28 #include "ui/base/events/event.h" |
| 29 #include "ui/base/gestures/gesture_configuration.h" | 29 #include "ui/base/gestures/gesture_configuration.h" |
| 30 #include "ui/base/hit_test.h" | 30 #include "ui/base/hit_test.h" |
| 31 #include "ui/base/keycodes/keyboard_codes.h" | 31 #include "ui/base/keycodes/keyboard_codes.h" |
| 32 #include "ui/compositor/layer.h" | 32 #include "ui/compositor/layer.h" |
| 33 #include "ui/compositor/scoped_layer_animation_settings.h" | 33 #include "ui/compositor/scoped_layer_animation_settings.h" |
| 34 #include "ui/gfx/canvas.h" | 34 #include "ui/gfx/canvas.h" |
| 35 #include "ui/gfx/screen.h" | 35 #include "ui/gfx/screen.h" |
| 36 | 36 |
| 37 DECLARE_WINDOW_PROPERTY_TYPE(const char*) | 37 DECLARE_WINDOW_PROPERTY_TYPE(const char*) |
| 38 DECLARE_WINDOW_PROPERTY_TYPE(int) | 38 DECLARE_WINDOW_PROPERTY_TYPE(int) |
| (...skipping 2497 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2536 // Move |w2| to be a child of |w1|. | 2536 // Move |w2| to be a child of |w1|. |
| 2537 w1->AddChild(w2.get()); | 2537 w1->AddChild(w2.get()); |
| 2538 // Sine we moved in the same root, observer shouldn't be notified. | 2538 // Sine we moved in the same root, observer shouldn't be notified. |
| 2539 EXPECT_EQ("0 0", observer.CountStringAndReset()); | 2539 EXPECT_EQ("0 0", observer.CountStringAndReset()); |
| 2540 // |w2| should still have focus after moving. | 2540 // |w2| should still have focus after moving. |
| 2541 EXPECT_TRUE(w2->HasFocus()); | 2541 EXPECT_TRUE(w2->HasFocus()); |
| 2542 } | 2542 } |
| 2543 | 2543 |
| 2544 } // namespace test | 2544 } // namespace test |
| 2545 } // namespace aura | 2545 } // namespace aura |
| OLD | NEW |