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 "base/at_exit.h" | 5 #include "base/at_exit.h" |
6 #include "base/command_line.h" | 6 #include "base/command_line.h" |
7 #include "base/i18n/icu_util.h" | 7 #include "base/i18n/icu_util.h" |
8 #include "base/memory/scoped_ptr.h" | 8 #include "base/memory/scoped_ptr.h" |
9 #include "base/message_loop.h" | 9 #include "base/message_loop.h" |
10 #include "third_party/skia/include/core/SkXfermode.h" | 10 #include "third_party/skia/include/core/SkXfermode.h" |
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
46 return false; | 46 return false; |
47 } | 47 } |
48 virtual gfx::NativeCursor GetCursor(const gfx::Point& point) OVERRIDE { | 48 virtual gfx::NativeCursor GetCursor(const gfx::Point& point) OVERRIDE { |
49 return gfx::kNullCursor; | 49 return gfx::kNullCursor; |
50 } | 50 } |
51 virtual int GetNonClientComponent(const gfx::Point& point) const OVERRIDE { | 51 virtual int GetNonClientComponent(const gfx::Point& point) const OVERRIDE { |
52 return HTCAPTION; | 52 return HTCAPTION; |
53 } | 53 } |
54 virtual bool ShouldDescendIntoChildForEventHandling( | 54 virtual bool ShouldDescendIntoChildForEventHandling( |
55 aura::Window* child, | 55 aura::Window* child, |
56 const gfx::Point& location) OVERRIDE { | 56 const gfx::Point& event_location, |
| 57 ui::EventType event_type) OVERRIDE { |
57 return true; | 58 return true; |
58 } | 59 } |
59 virtual bool OnMouseEvent(ui::MouseEvent* event) OVERRIDE { | 60 virtual bool OnMouseEvent(ui::MouseEvent* event) OVERRIDE { |
60 return true; | 61 return true; |
61 } | 62 } |
62 virtual ui::TouchStatus OnTouchEvent(ui::TouchEvent* event) OVERRIDE { | 63 virtual ui::TouchStatus OnTouchEvent(ui::TouchEvent* event) OVERRIDE { |
63 return ui::TOUCH_STATUS_END; | 64 return ui::TOUCH_STATUS_END; |
64 } | 65 } |
65 virtual ui::GestureStatus OnGestureEvent( | 66 virtual ui::GestureStatus OnGestureEvent( |
66 ui::GestureEvent* event) OVERRIDE { | 67 ui::GestureEvent* event) OVERRIDE { |
(...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
160 window3.Show(); | 161 window3.Show(); |
161 window3.SetParent(&window2); | 162 window3.SetParent(&window2); |
162 | 163 |
163 root_window->ShowRootWindow(); | 164 root_window->ShowRootWindow(); |
164 MessageLoopForUI::current()->Run(); | 165 MessageLoopForUI::current()->Run(); |
165 | 166 |
166 ui::CompositorTestSupport::Terminate(); | 167 ui::CompositorTestSupport::Terminate(); |
167 | 168 |
168 return 0; | 169 return 0; |
169 } | 170 } |
OLD | NEW |