| 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/event_filter.h" | 5 #include "ui/aura/event_filter.h" |
| 6 | 6 |
| 7 #include "base/basictypes.h" | 7 #include "base/basictypes.h" |
| 8 #include "base/compiler_specific.h" | 8 #include "base/compiler_specific.h" |
| 9 #include "ui/aura/event.h" | 9 #include "ui/aura/event.h" |
| 10 #include "ui/aura/root_window.h" | 10 #include "ui/aura/root_window.h" |
| (...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 64 int key_event_count_; | 64 int key_event_count_; |
| 65 int mouse_event_count_; | 65 int mouse_event_count_; |
| 66 int touch_event_count_; | 66 int touch_event_count_; |
| 67 | 67 |
| 68 DISALLOW_COPY_AND_ASSIGN(TestEventFilterWindowDelegate); | 68 DISALLOW_COPY_AND_ASSIGN(TestEventFilterWindowDelegate); |
| 69 }; | 69 }; |
| 70 | 70 |
| 71 Window* CreateWindow(int id, Window* parent, WindowDelegate* delegate) { | 71 Window* CreateWindow(int id, Window* parent, WindowDelegate* delegate) { |
| 72 Window* window = new Window(delegate ? delegate : new TestWindowDelegate); | 72 Window* window = new Window(delegate ? delegate : new TestWindowDelegate); |
| 73 window->set_id(id); | 73 window->set_id(id); |
| 74 window->Init(ui::Layer::LAYER_HAS_TEXTURE); | 74 window->Init(ui::Layer::LAYER_TEXTURED); |
| 75 window->SetParent(parent); | 75 window->SetParent(parent); |
| 76 window->SetBounds(gfx::Rect(0, 0, 100, 100)); | 76 window->SetBounds(gfx::Rect(0, 0, 100, 100)); |
| 77 window->Show(); | 77 window->Show(); |
| 78 return window; | 78 return window; |
| 79 } | 79 } |
| 80 | 80 |
| 81 // Creates this hierarchy: | 81 // Creates this hierarchy: |
| 82 // | 82 // |
| 83 // RootWindow (EF) | 83 // RootWindow (EF) |
| 84 // +- w1 (EF) | 84 // +- w1 (EF) |
| (...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 145 EXPECT_EQ(0, w111_filter->mouse_event_count()); | 145 EXPECT_EQ(0, w111_filter->mouse_event_count()); |
| 146 EXPECT_EQ(0, d1111->mouse_event_count()); | 146 EXPECT_EQ(0, d1111->mouse_event_count()); |
| 147 EXPECT_EQ(0, root_window_filter->touch_event_count()); | 147 EXPECT_EQ(0, root_window_filter->touch_event_count()); |
| 148 EXPECT_EQ(0, w1_filter->touch_event_count()); | 148 EXPECT_EQ(0, w1_filter->touch_event_count()); |
| 149 EXPECT_EQ(0, w111_filter->touch_event_count()); | 149 EXPECT_EQ(0, w111_filter->touch_event_count()); |
| 150 EXPECT_EQ(0, d1111->touch_event_count()); | 150 EXPECT_EQ(0, d1111->touch_event_count()); |
| 151 } | 151 } |
| 152 | 152 |
| 153 } // namespace test | 153 } // namespace test |
| 154 } // namespace aura | 154 } // namespace aura |
| OLD | NEW |