OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 13 matching lines...) Expand all Loading... |
24 #endif | 24 #endif |
25 | 25 |
26 namespace { | 26 namespace { |
27 | 27 |
28 // Trivial WindowDelegate implementation that draws a colored background. | 28 // Trivial WindowDelegate implementation that draws a colored background. |
29 class DemoWindowDelegate : public aura::WindowDelegate { | 29 class DemoWindowDelegate : public aura::WindowDelegate { |
30 public: | 30 public: |
31 explicit DemoWindowDelegate(SkColor color) : color_(color) {} | 31 explicit DemoWindowDelegate(SkColor color) : color_(color) {} |
32 | 32 |
33 // Overridden from WindowDelegate: | 33 // Overridden from WindowDelegate: |
| 34 virtual void OnBoundsChanging(gfx::Rect* new_bounds) OVERRIDE {} |
34 virtual void OnBoundsChanged(const gfx::Rect& old_bounds, | 35 virtual void OnBoundsChanged(const gfx::Rect& old_bounds, |
35 const gfx::Rect& new_bounds) OVERRIDE {} | 36 const gfx::Rect& new_bounds) OVERRIDE {} |
36 virtual void OnFocus() OVERRIDE {} | 37 virtual void OnFocus() OVERRIDE {} |
37 virtual void OnBlur() OVERRIDE {} | 38 virtual void OnBlur() OVERRIDE {} |
38 virtual bool OnKeyEvent(aura::KeyEvent* event) OVERRIDE { | 39 virtual bool OnKeyEvent(aura::KeyEvent* event) OVERRIDE { |
39 return false; | 40 return false; |
40 } | 41 } |
41 virtual gfx::NativeCursor GetCursor(const gfx::Point& point) OVERRIDE { | 42 virtual gfx::NativeCursor GetCursor(const gfx::Point& point) OVERRIDE { |
42 return gfx::kNullCursor; | 43 return gfx::kNullCursor; |
43 } | 44 } |
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
111 window3.Show(); | 112 window3.Show(); |
112 window3.SetParent(&window2); | 113 window3.SetParent(&window2); |
113 | 114 |
114 aura::Desktop::GetInstance()->Run(); | 115 aura::Desktop::GetInstance()->Run(); |
115 | 116 |
116 ui::CompositorTestSupport::Terminate(); | 117 ui::CompositorTestSupport::Terminate(); |
117 | 118 |
118 return 0; | 119 return 0; |
119 } | 120 } |
120 | 121 |
OLD | NEW |