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 46 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
57 return ui::TOUCH_STATUS_END; | 57 return ui::TOUCH_STATUS_END; |
58 } | 58 } |
59 virtual ui::GestureStatus OnGestureEvent(aura::GestureEvent* event) OVERRIDE { | 59 virtual ui::GestureStatus OnGestureEvent(aura::GestureEvent* event) OVERRIDE { |
60 return ui::GESTURE_STATUS_UNKNOWN; | 60 return ui::GESTURE_STATUS_UNKNOWN; |
61 } | 61 } |
62 virtual bool CanFocus() OVERRIDE { return true; } | 62 virtual bool CanFocus() OVERRIDE { return true; } |
63 virtual void OnCaptureLost() OVERRIDE {} | 63 virtual void OnCaptureLost() OVERRIDE {} |
64 virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE { | 64 virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE { |
65 canvas->DrawColor(color_, SkXfermode::kSrc_Mode); | 65 canvas->DrawColor(color_, SkXfermode::kSrc_Mode); |
66 } | 66 } |
| 67 virtual void OnDeviceScaleFactorChanged(float device_scale_factor) OVERRIDE {} |
67 virtual void OnWindowDestroying() OVERRIDE {} | 68 virtual void OnWindowDestroying() OVERRIDE {} |
68 virtual void OnWindowDestroyed() OVERRIDE {} | 69 virtual void OnWindowDestroyed() OVERRIDE {} |
69 virtual void OnWindowVisibilityChanged(bool visible) OVERRIDE {} | 70 virtual void OnWindowVisibilityChanged(bool visible) OVERRIDE {} |
70 | 71 |
71 private: | 72 private: |
72 SkColor color_; | 73 SkColor color_; |
73 | 74 |
74 DISALLOW_COPY_AND_ASSIGN(DemoWindowDelegate); | 75 DISALLOW_COPY_AND_ASSIGN(DemoWindowDelegate); |
75 }; | 76 }; |
76 | 77 |
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
142 window3.Show(); | 143 window3.Show(); |
143 window3.SetParent(&window2); | 144 window3.SetParent(&window2); |
144 | 145 |
145 root_window->ShowRootWindow(); | 146 root_window->ShowRootWindow(); |
146 MessageLoopForUI::current()->Run(); | 147 MessageLoopForUI::current()->Run(); |
147 | 148 |
148 ui::CompositorTestSupport::Terminate(); | 149 ui::CompositorTestSupport::Terminate(); |
149 | 150 |
150 return 0; | 151 return 0; |
151 } | 152 } |
OLD | NEW |